rpms/ejabberd/devel ejabberd-build.patch, NONE, 1.1 ejabberd-ssl.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 ejab-446.patch, 1.1, 1.2 ejabberd.init, 1.3, 1.4 ejabberd.spec, 1.17, 1.18 sources, 1.8, 1.9 ejabberdctl, 1.2, NONE inetrc, 1.1, NONE
Peter Lemenkov (peter)
fedora-extras-commits at redhat.com
Wed Jan 23 19:12:51 UTC 2008
- Previous message (by thread): rpms/libprelude/devel .cvsignore, 1.5, 1.6 libprelude.spec, 1.7, 1.8 sources, 1.5, 1.6
- Next message (by thread): rpms/ddclient/EL-4 ddclient.rwtab, NONE, 1.1 .cvsignore, 1.2, 1.3 ddclient.initscript, 1.1, 1.2 ddclient.spec, 1.3, 1.4 ddclient.sysconfig, 1.1, 1.2 sources, 1.2, 1.3 ddclient.cache.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: peter
Update of /cvs/extras/rpms/ejabberd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1889/devel
Modified Files:
.cvsignore ejab-446.patch ejabberd.init ejabberd.spec sources
Added Files:
ejabberd-build.patch ejabberd-ssl.patch
Removed Files:
ejabberdctl inetrc
Log Message:
Initial try to push 2.0.0
ejabberd-build.patch:
--- NEW FILE ejabberd-build.patch ---
diff -up ejabberd-2.0.0-beta1/src/Makefile.in.MC-build ejabberd-2.0.0-beta1/src/Makefile.in
--- ejabberd-2.0.0-beta1/src/Makefile.in.MC-build 2007-12-24 15:33:44.000000000 +0100
+++ ejabberd-2.0.0-beta1/src/Makefile.in 2007-12-26 18:58:29.000000000 +0100
@@ -55,7 +55,7 @@ SODIR = $(PRIVDIR)/lib
MSGSDIR = $(PRIVDIR)/msgs
LOGDIR = $(DESTDIR)@prefix@/var/log/ejabberd
ETCDIR = $(DESTDIR)@prefix@/etc/ejabberd
-SBINDIR = $(DESTDIR)@prefix@/sbin
+SBINDIR = $(DESTDIR)@prefix@/usr/sbin
ifeq ($(shell uname),Darwin)
DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress
ejabberd-ssl.patch:
--- NEW FILE ejabberd-ssl.patch ---
diff -urN ejabberd-1.1.4.orig/src/aclocal.m4 ejabberd-1.1.4/src/aclocal.m4
--- ejabberd-1.1.4.orig/src/aclocal.m4 2006-04-23 17:35:14.000000000 +0200
+++ ejabberd-1.1.4/src/aclocal.m4 2008-01-23 10:15:01.000000000 +0100
@@ -79,14 +79,21 @@
-author('alexey at sevcom.net').
-export([[start/0]]).
+-include_lib("ssl/include/ssl_pkix.hrl").
start() ->
EIDirS = code:lib_dir("erl_interface") ++ "\n",
EILibS = libpath("erl_interface") ++ "\n",
RootDirS = code:root_dir() ++ "\n",
- file:write_file("conftest.out", list_to_binary(EIDirS ++ EILibS ++ RootDirS)),
+ file:write_file("conftest.out", list_to_binary(EIDirS ++ EILibS ++ ssldef() ++ RootDirS)),
halt().
+-ifdef('id-pkix').
+ssldef() -> "-DSSL39\n".
+-else.
+ssldef() "\n".
+-endif.
+
%% return physical architecture based on OS/Processor
archname() ->
ArchStr = erlang:system_info(system_architecture),
@@ -135,6 +142,8 @@
# Second line
ERLANG_EI_LIB=`cat conftest.out | head -n 2 | tail -n 1`
# Third line
+ ERLANG_SSL39=`cat conftest.out | head -n 3 | tail -n 1`
+ # End line
ERLANG_DIR=`cat conftest.out | tail -n 1`
ERLANG_CFLAGS="-I$ERLANG_EI_DIR/include -I$ERLANG_DIR/usr/include"
@@ -142,6 +151,7 @@
AC_SUBST(ERLANG_CFLAGS)
AC_SUBST(ERLANG_LIBS)
+ AC_SUBST(ERLANG_SSL39)
AC_SUBST(ERLC)
AC_SUBST(ERL)
])
diff -urN ejabberd-1.1.4.orig/src/configure ejabberd-1.1.4/src/configure
--- ejabberd-1.1.4.orig/src/configure 2006-09-03 17:15:46.000000000 +0200
+++ ejabberd-1.1.4/src/configure 2008-01-23 10:15:01.000000000 +0100
@@ -648,6 +648,7 @@
ERLC
ERL
ERLANG_CFLAGS
+ERLANG_SSL39
ERLANG_LIBS
LIBICONV
CPP
@@ -2865,14 +2866,21 @@
-author('alexey at sevcom.net').
-export([start/0]).
+-include_lib("ssl/include/ssl_pkix.hrl").
start() ->
EIDirS = code:lib_dir("erl_interface") ++ "\n",
EILibS = libpath("erl_interface") ++ "\n",
RootDirS = code:root_dir() ++ "\n",
- file:write_file("conftest.out", list_to_binary(EIDirS ++ EILibS ++ RootDirS)),
+ file:write_file("conftest.out", list_to_binary(EIDirS ++ EILibS ++ ssldef() ++ RootDirS)),
halt().
+-ifdef('id-pkix').
+ssldef() -> "-DSSL39\n".
+-else.
+ssldef() -> "\n".
+-endif.
+
%% return physical architecture based on OS/Processor
archname() ->
ArchStr = erlang:system_info(system_architecture),
@@ -2927,6 +2935,8 @@
# Second line
ERLANG_EI_LIB=`cat conftest.out | head -n 2 | tail -n 1`
# Third line
+ ERLANG_SSL39=`cat conftest.out | head -n 3 | tail -n 1`
+ # End line
ERLANG_DIR=`cat conftest.out | tail -n 1`
ERLANG_CFLAGS="-I$ERLANG_EI_DIR/include -I$ERLANG_DIR/usr/include"
@@ -6205,6 +6215,7 @@
ERL!$ERL$ac_delim
ERLANG_CFLAGS!$ERLANG_CFLAGS$ac_delim
ERLANG_LIBS!$ERLANG_LIBS$ac_delim
+ERLANG_SSL39!$ERLANG_SSL39$ac_delim
LIBICONV!$LIBICONV$ac_delim
CPP!$CPP$ac_delim
GREP!$GREP$ac_delim
@@ -6237,7 +6248,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `grep -c "$ac_delim\$" conf$$subs.sed` = 79; then
+ if test `grep -c "$ac_delim\$" conf$$subs.sed` = 80; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -urN ejabberd-1.1.4.orig/src/ejabberd_s2s_in.erl ejabberd-1.1.4/src/ejabberd_s2s_in.erl
--- ejabberd-1.1.4.orig/src/ejabberd_s2s_in.erl 2006-06-19 04:32:57.000000000 +0200
+++ ejabberd-1.1.4/src/ejabberd_s2s_in.erl 2008-01-23 10:16:25.000000000 +0100
@@ -30,8 +30,12 @@
-include("ejabberd.hrl").
-include("jlib.hrl").
+-ifdef(SSL39).
+-include_lib("ssl/include/ssl_pkix.hrl").
+-else.
-include_lib("ssl/include/PKIX1Explicit88.hrl").
-include_lib("ssl/include/PKIX1Implicit88.hrl").
+-endif.
-include("XmppAddr.hrl").
-define(DICT, dict).
diff -urN ejabberd-1.1.4.orig/src/Makefile.in ejabberd-1.1.4/src/Makefile.in
--- ejabberd-1.1.4.orig/src/Makefile.in 2008-01-23 10:11:01.000000000 +0100
+++ ejabberd-1.1.4/src/Makefile.in 2008-01-23 10:15:01.000000000 +0100
@@ -12,6 +12,8 @@
EXPAT_LIBS = @EXPAT_LIBS@
ERLANG_LIBS = @ERLANG_LIBS@
+ERLC_FLAGS += @ERLANG_SSL39@
+
# make debug=true to compile Erlang module with debug informations.
ifdef debug
ERLC_FLAGS+=+debug_info
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 11 Dec 2007 16:30:26 -0000 1.6
+++ .cvsignore 23 Jan 2008 19:12:15 -0000 1.7
@@ -1 +1 @@
-ejab-446.patch
+ejabberd-2.0.0-rc1.tar.gz
ejab-446.patch:
Index: ejab-446.patch
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/devel/ejab-446.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ejab-446.patch 11 Dec 2007 16:52:29 -0000 1.1
+++ ejab-446.patch 23 Jan 2008 19:12:15 -0000 1.2
@@ -1,14 +1,13 @@
-Index: src/ejabberd_s2s_in.erl
-===================================================================
---- src/ejabberd_s2s_in.erl (revision 1026)
-+++ src/ejabberd_s2s_in.erl (working copy)
-@@ -30,8 +30,7 @@
-
- -include("ejabberd.hrl").
- -include("jlib.hrl").
+diff -up ejabberd-2.0.0/src/ejabberd_s2s_in.erl.Er12b-build ejabberd-2.0.0/src/ejabberd_s2s_in.erl
+--- ejabberd-2.0.0/src/ejabberd_s2s_in.erl.Er12b-build 2008-01-16 11:33:27.000000000 +0100
++++ ejabberd-2.0.0/src/ejabberd_s2s_in.erl 2008-01-19 23:50:11.000000000 +0100
+@@ -51,8 +51,7 @@
+ -ifdef(SSL39).
+ -include_lib("ssl/include/ssl_pkix.hrl").
+ -else.
--include_lib("ssl/include/PKIX1Explicit88.hrl").
--include_lib("ssl/include/PKIX1Implicit88.hrl").
+-include_lib("ssl/include/OTP-PKIX.hrl").
+ -endif.
-include("XmppAddr.hrl").
- -define(DICT, dict).
Index: ejabberd.init
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/devel/ejabberd.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ejabberd.init 31 Jul 2007 14:03:27 -0000 1.3
+++ ejabberd.init 23 Jan 2008 19:12:15 -0000 1.4
@@ -8,6 +8,7 @@
# pidfile: /var/run/ejabberd.pid
### BEGIN INIT INFO
+# Provides: ejabberd
# Required-Start: network
# Required-Stop: network
# Short-Description: Start and stop ejabberd
Index: ejabberd.spec
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/devel/ejabberd.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ejabberd.spec 11 Dec 2007 22:59:18 -0000 1.17
+++ ejabberd.spec 23 Jan 2008 19:12:15 -0000 1.18
@@ -1,15 +1,14 @@
Name: ejabberd
-Version: 1.1.4
-Release: 3%{?dist}
+Version: 2.0.0
+Release: 0.2.rc1%{?dist}
Summary: A distributed, fault-tolerant Jabber/XMPP server
Group: Applications/Internet
License: GPLv2
URL: http://ejabberd.jabber.ru/
-Source0: http://www.process-one.net/en/projects/ejabberd/download/%{version}/ejabberd-%{version}.tar.gz
+Source0: http://www.process-one.net/en/projects/ejabberd/download/2.0.0-rc1/ejabberd-2.0.0-rc1.tar.gz
Source1: ejabberd.init
Source2: ejabberd.logrotate
-Source3: inetrc
# http://ejabberd.jabber.ru/ejabberdctl-extra
Source4: https://svn.process-one.net/ejabberd-modules/mod_ctlextra/trunk/src/mod_ctlextra.erl
@@ -18,8 +17,8 @@
Source5: ejabberd_auth_ad.erl
Source6: mod_shared_roster_ad.erl
Source7: mod_vcard_ad.erl
-
-Source8: ejabberdctl
+#
+#Source8: ejabberdctl
Source9: ejabberdctl.pam
Source10: ejabberdctl.apps
@@ -27,6 +26,12 @@
# https://support.process-one.net/secure/attachment/11788/ejab-446.patch
Patch0: ejab-446.patch
+# local stuff
+Patch1: ejabberd-build.patch
+
+# R12B
+Patch2: ejabberd-ssl.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: expat-devel
@@ -79,21 +84,23 @@
fi
%prep
-%setup -q
-%patch0 -p0 -b .Er12b-build
+%setup -q -n %{name}-%{version}
+%patch0 -p1 -b .Er12b-build
+%patch1 -p1 -b .MC-build
+#%patch2 -p1 -b .R12B
%{__perl} -pi -e "s!/var/lib/ejabberd!%{_libdir}/ejabberd-%{version}!g" src/Makefile.in
%{__perl} -pi -e "s!/etc!%{_sysconfdir}!g" src/Makefile.in
%{__perl} -pi -e "s!\@prefix\@!!g" src/Makefile.in
-cp %{S:4} src
-cp %{S:5} src
-cp %{S:6} src
-cp %{S:7} src
+#cp %{S:4} src
+#cp %{S:5} src
+#cp %{S:6} src
+#cp %{S:7} src
%build
pushd src
-%configure --enable-odbc
+%configure --enable-odbc --enable-debug
make %{?_smp_mflags}
popd
pushd doc
@@ -116,7 +123,7 @@
mkdir -p %{buildroot}%{_bindir}
ln -s consolehelper %{buildroot}%{_bindir}/ejabberdctl
-install -D -p -m 0755 %{S:8} %{buildroot}%{_sbindir}/ejabberdctl
+#install -D -p -m 0755 %{S:8} %{buildroot}%{_sbindir}/ejabberdctl
install -D -p -m 0644 %{S:9} %{buildroot}%{_sysconfdir}/pam.d/ejabberdctl
install -D -p -m 0644 %{S:10} %{buildroot}%{_sysconfdir}/security/console.apps/ejabberdctl
@@ -130,7 +137,8 @@
%{__perl} -pi -e 's!\@libdir\@!%{_libdir}!g' %{buildroot}%{_initrddir}/ejabberd %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd %{buildroot}%{_sbindir}/ejabberdctl
%{__perl} -pi -e 's!\@version\@!%{version}!g' %{buildroot}%{_initrddir}/ejabberd %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd %{buildroot}%{_sbindir}/ejabberdctl
-cp %{S:3} %{buildroot}%{_sysconfdir}/ejabberd/inetrc
+#cp %{S:3} %{buildroot}%{_sysconfdir}/ejabberd/inetrc
+#mv %{buildroot}%{_sysconfdir}/ejabberd/{ejabberd.,}inetrc
%clean
rm -rf %{buildroot}
@@ -141,6 +149,7 @@
%attr(750,ejabberd,ejabberd) %dir %{_sysconfdir}/ejabberd
%attr(640,ejabberd,ejabberd) %config(noreplace) %{_sysconfdir}/ejabberd/ejabberd.cfg
+%attr(640,ejabberd,ejabberd) %config(noreplace) %{_sysconfdir}/ejabberd/ejabberdctl.cfg
%attr(640,ejabberd,ejabberd) %config(noreplace) %{_sysconfdir}/ejabberd/inetrc
%{_initrddir}/ejabberd
@@ -171,13 +180,21 @@
%files doc
%defattr(-,root,root,-)
-%doc ChangeLog COPYING TODO doc/*.pdf doc/*.html doc/*.png doc/release_notes_*
+%doc ChangeLog COPYING doc/*.pdf doc/*.html doc/*.png doc/release_notes_*
%changelog
-* Tue Dec 11 2007 Matej Cepl <mcepl at redhat.com> 1.1.4-3
-- debug shouldn't be enabled on distributed package.
-* Tue Dec 11 2007 Matej Cepl <mcepl at redhat.com> 1.1.4-2
+* Wed Jan 23 2008 Peter Lemenkov <lemenkov at gmail.com> 2.0.0-0.2.rc1
+- Enabled some previously disabled modules
+
+* Sat Jan 19 2008 Matej Cepl <mcepl at redhat.com> 2.0.0-0.1.rc1
+- Upgrade to the current upsteram version.
+- Make ejabberd.init LSB compliant (missing Provides: tag)
+
+* Thu Dec 27 2007 Matej Cepl <mcepl at redhat.com> 2.0.0-0.beta1.mc.1
+- Experimental build from the upstream betaversion.
+
+* Tue Dec 11 2007 Matej Cepl <mcepl at redhat.com> 1.1.4-2.fc9
- rebuild against new ssl library.
- rebuild against the newest erlang (see Patch
- fix %%changelog
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 11 Dec 2007 16:59:45 -0000 1.8
+++ sources 23 Jan 2008 19:12:15 -0000 1.9
@@ -1 +1 @@
-65e9cd346f11a28afbacfe1d7be3a33b ejabberd-1.1.4.tar.gz
+a94390f3dd8a56ff9b866f002be72229 ejabberd-2.0.0-rc1.tar.gz
--- ejabberdctl DELETED ---
--- inetrc DELETED ---
- Previous message (by thread): rpms/libprelude/devel .cvsignore, 1.5, 1.6 libprelude.spec, 1.7, 1.8 sources, 1.5, 1.6
- Next message (by thread): rpms/ddclient/EL-4 ddclient.rwtab, NONE, 1.1 .cvsignore, 1.2, 1.3 ddclient.initscript, 1.1, 1.2 ddclient.spec, 1.3, 1.4 ddclient.sysconfig, 1.1, 1.2 sources, 1.2, 1.3 ddclient.cache.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list