diff --git a/.cvsignore b/.cvsignore index ed7e908..acb8e0d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ejabberd-2.0.0.tar.gz +ejabberd-2.0.1_2.tar.gz diff --git a/ejab-446.patch b/ejab-446.patch deleted file mode 100644 index 4d5ecda..0000000 --- a/ejab-446.patch +++ /dev/null @@ -1,13 +0,0 @@ -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"). - diff --git a/ejabberd-build.patch b/ejabberd-build.patch index bf64edc..b1944ee 100644 --- a/ejabberd-build.patch +++ b/ejabberd-build.patch @@ -1,12 +1,11 @@ -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 +--- src/Makefile.in~ 2008-05-23 14:59:01.000000000 +0400 ++++ src/Makefile.in 2008-05-23 16:27:42.000000000 +0400 +@@ -56,7 +56,7 @@ - ifeq ($(shell uname),Darwin) - DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress + DESTDIR = + +-EJABBERDDIR = $(DESTDIR)@localstatedir@/lib/ejabberd ++EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd + BEAMDIR = $(EJABBERDDIR)/ebin + PRIVDIR = $(EJABBERDDIR)/priv + SODIR = $(PRIVDIR)/lib diff --git a/ejabberd-ssl.patch b/ejabberd-ssl.patch deleted file mode 100644 index e3e05ef..0000000 --- a/ejabberd-ssl.patch +++ /dev/null @@ -1,131 +0,0 @@ -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@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@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 diff --git a/ejabberd.init b/ejabberd.init index 02967a5..7866893 100644 --- a/ejabberd.init +++ b/ejabberd.init @@ -22,7 +22,7 @@ node=`hostname | cut -d. -f1` start() { echo -n $"Starting ejabberd: " daemon --user=ejabberd --check=ejabberd \ - "erl" "-pa @libdir@/ejabberd-@version@/ebin \ + "erl" "-pa @libdir@/ejabberd/ebin \ -sname ejabberd \ -s ejabberd \ -ejabberd config \\\"/etc/ejabberd/ejabberd.cfg\\\" \ @@ -40,7 +40,7 @@ start() { stop() { # Stop daemons. echo -n "Shutting down ejabberd: " - /sbin/runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd-@version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@$node stop" && success || failure + /sbin/runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@$node stop" && success || failure RETVAL=$? [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/ejabberd echo @@ -74,7 +74,7 @@ case "$1" in [ -f /var/lock/subsys/ejabberd ] && restart || : ;; status) - /sbin/runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd-@version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@$node status" + /sbin/runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@$node status" ;; *) echo "Usage: ejabberd {start|stop|restart|force-reload|condrestart|try-restart|status}" diff --git a/ejabberd.logrotate b/ejabberd.logrotate index 2aaefb5..20fffc8 100644 --- a/ejabberd.logrotate +++ b/ejabberd.logrotate @@ -4,6 +4,6 @@ create 0640 ejabberd ejabberd sharedscripts postrotate - runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd-@version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@`hostname -s` reopen-log" >/dev/null 2>/dev/null || true + runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@`hostname -s` reopen-log" >/dev/null 2>/dev/null || true endscript } diff --git a/ejabberd.spec b/ejabberd.spec index 33cdc5b..696be79 100644 --- a/ejabberd.spec +++ b/ejabberd.spec @@ -1,12 +1,12 @@ Name: ejabberd -Version: 2.0.0 +Version: 2.0.1 Release: 1%{?dist} Summary: A distributed, fault-tolerant Jabber/XMPP server Group: Applications/Internet -License: GPLv2 +License: GPLv2+ URL: http://www.ejabberd.im/ -Source0: http://www.process-one.net/downloads/%{name}/%{version}/%{name}-%{version}.tar.gz +Source0: http://www.process-one.net/downloads/%{name}/%{version}/%{name}-%{version}_2.tar.gz Source1: ejabberd.init Source2: ejabberd.logrotate @@ -22,22 +22,19 @@ Source7: mod_vcard_ad.erl Source9: ejabberdctl.pam Source10: ejabberdctl.apps -# originally from -# https://support.process-one.net/secure/attachment/11788/ejab-446.patch -Patch0: ejab-446.patch - -# local stuff +# Fedora-specific stuff - fixing paths Patch1: ejabberd-build.patch -# R12B -Patch2: ejabberd-ssl.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: expat-devel BuildRequires: openssl-devel +BuildRequires: pam-devel BuildRequires: erlang +BuildRequires: dos2unix +%if %{undefined rhel} BuildRequires: hevea +%endif Requires: erlang Requires: usermode @@ -85,13 +82,8 @@ fi %prep %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 +%patch1 -p0 -b .fix_paths +dos2unix src/odbc/mssql.sql cp %{S:4} src cp %{S:5} src @@ -101,11 +93,14 @@ cp %{S:7} src %build pushd src %configure --enable-odbc --enable-debug -make %{?_smp_mflags} +# doesn't builds on SMP currently +make popd +%if %{undefined rhel} pushd doc make html pdf popd +%endif %install rm -rf %{buildroot} @@ -114,7 +109,7 @@ pushd src make install DESTDIR=%{buildroot} popd -chmod a+x %{buildroot}%{_libdir}/ejabberd-%{version}/priv/lib/*.so +chmod a+x %{buildroot}%{_libdir}/%{name}/priv/lib/*.so %{__perl} -pi -e 's!./ssl.pem!/etc/ejabberd/ejabberd.pem!g' %{buildroot}/etc/ejabberd/ejabberd.cfg @@ -137,15 +132,12 @@ cp -p %{S:2} %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd %{__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 -#mv %{buildroot}%{_sysconfdir}/ejabberd/{ejabberd.,}inetrc - %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc COPYING +%doc COPYING src/odbc/mysql.sql src/odbc/mssql.sql src/odbc/pg.sql %attr(750,ejabberd,ejabberd) %dir %{_sysconfdir}/ejabberd %attr(640,ejabberd,ejabberd) %config(noreplace) %{_sysconfdir}/ejabberd/ejabberd.cfg @@ -160,29 +152,43 @@ rm -rf %{buildroot} %{_bindir}/ejabberdctl %{_sbindir}/ejabberdctl -%dir %{_libdir}/ejabberd-%{version} -%dir %{_libdir}/ejabberd-%{version}/ebin -%{_libdir}/ejabberd-%{version}/ebin/*.app -%{_libdir}/ejabberd-%{version}/ebin/*.beam - -%dir %{_libdir}/ejabberd-%{version}/priv - -%dir %{_libdir}/ejabberd-%{version}/priv/lib -%{_libdir}/ejabberd-%{version}/priv/lib/*.so +%dir %{_libdir}/%{name} +%dir %{_libdir}/%{name}/ebin +%dir %{_libdir}/%{name}/priv +%dir %{_libdir}/%{name}/priv/bin +%dir %{_libdir}/%{name}/priv/lib +%dir %{_libdir}/%{name}/priv/msgs -%dir %{_libdir}/ejabberd-%{version}/priv/msgs -%{_libdir}/ejabberd-%{version}/priv/msgs/*.msg +%{_libdir}/%{name}/ebin/*.app +%{_libdir}/%{name}/ebin/*.beam +%{_libdir}/%{name}/priv/lib/*.so +%{_libdir}/%{name}/priv/msgs/*.msg %attr(750,ejabberd,ejabberd) %dir /var/lib/ejabberd %attr(750,ejabberd,ejabberd) %dir /var/lib/ejabberd/spool - %attr(750,ejabberd,ejabberd) %dir /var/log/ejabberd %files doc %defattr(-,root,root,-) -%doc ChangeLog COPYING doc/*.pdf doc/*.html doc/*.png doc/release_notes_* +%if %{undefined rhel} +%doc ChangeLog COPYING doc/release_notes_* doc/*.pdf doc/*.html doc/*.png +%else +%doc ChangeLog COPYING doc/release_notes_* +%endif %changelog +* Sat May 24 2008 Peter Lemenkov 2.0.1-1 +- Ver. 2.0.1 +- Upstreamed patches dropped +- No longer uses versioned libdir (/usr/lib/ejabberd-x.x.x) +- Added sql-scripts in docs-directory + +* Mon May 5 2008 Peter Lemenkov 2.0.0-3 +- Fix build against R11B-2 + +* Sat Feb 23 2008 Peter Lemenkov 2.0.0-2 +- Disable docs again for EPEL (we haven't hevea for EPEL) + * Sat Feb 23 2008 Peter Lemenkov 2.0.0-1 - Version 2.0.0 @@ -194,7 +200,7 @@ rm -rf %{buildroot} * Wed Jan 23 2008 Peter Lemenkov 2.0.0-0.2.rc1 - Enabled some previously disabled modules - + * Sat Jan 19 2008 Matej Cepl 2.0.0-0.1.rc1 - Upgrade to the current upsteram version. - Make ejabberd.init LSB compliant (missing Provides: tag) diff --git a/sources b/sources index 1fdd927..305ab9e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -93b21f2fa0ca6074bd22ab924e7dced8 ejabberd-2.0.0.tar.gz +9c9417ab8dc334094ec7a611016c726e ejabberd-2.0.1_2.tar.gz