openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package jabberd

--- jabberd-libpq.patch.orig
+++ jabberd-libpq.patch
@@ -27,7 +27,7 @@
  AC_SUBST(PGSQL_LIBS)
 --- configure.orig
 +++ configure
-@@ -17251,6 +17186,67 @@ if test "x-$enable_pgsql" != "x-no" ; th
+@@ -17251,6 +17251,136 @@ if test "x-$enable_pgsql" != "x-no" ; th
  		PGSQL_PREFIX=/usr
  	fi
  
@@ -92,18 +92,6 @@
 +
 +
 +
- 	# Extract the first word of "pg_config", so it can be a program name with args.
- set dummy pg_config; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-@@ -17315,6 +17311,95 @@ $as_echo "\"$PGSQL_CFLAGS\"" >&6; }
- $as_echo "#define STORAGE_POSTGRES 1" >>confdefs.h
- 
- 	fi
-+elif test $pkg_failed = untried; then
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+
-+
 +	# Extract the first word of "pg_config", so it can be a program name with args.
 +set dummy pg_config; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -168,6 +156,18 @@
 +$as_echo "#define STORAGE_POSTGRES 1" >>confdefs.h
 +
 +	fi
++elif test $pkg_failed = untried; then
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++
++
+ 	# Extract the first word of "pg_config", so it can be a program name with args.
+ set dummy pg_config; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+@@ -17315,6 +17445,26 @@ $as_echo "\"$PGSQL_CFLAGS\"" >&6; }
+ $as_echo "#define STORAGE_POSTGRES 1" >>confdefs.h
+ 
+ 	fi
 +else
 +	PGSQL_CFLAGS=$pkg_cv_PGSQL_CFLAGS
 +	PGSQL_LIBS=$pkg_cv_PGSQL_LIBS
--- jabberd.changes.orig
+++ jabberd.changes
@@ -28,6 +28,18 @@ Sat Dec 11 17:21:22 UTC 2017 - jgonzalez
   * jabberd-etc.patch
 
 -------------------------------------------------------------------
+Tue Jun 28 12:50:07 UTC 2016 - max@suse.com
+
+- Improve the verify module (jabberd-verify.patch):
+  * Use chat messages instead of normal ones, so that the
+    verification process appears as a conversation rather than
+    an unrelated sequence of messages.
+  * Use a sender jid with a domain, so that clients don't get
+    confused.
+  * Call pwgen and sendmail by their full paths.
+  * Clean up the code and break lines before 80 chars.
+
+-------------------------------------------------------------------
 Thu Jun  2 09:28:23 UTC 2016 - fweiss@suse.com
 
 - New version 2.4.0
--- jabberd.spec.orig
+++ jabberd.spec
@@ -43,6 +43,7 @@ Source2:        jabberd.pam
 Source3:        jabberd-rpmlintrc
 Patch5:         jabberd-etc.patch
 Patch6:         jabberd-libpq.patch
+Patch8:         jabberd-verify.patch
 # Needed for init script,
 PreReq:         pwdutils
 AutoReqProv:    on
@@ -107,12 +108,26 @@ Requires:       %name = %version
 This package contains the driver needed to use
 PAM as an authentication backend for jabberd.
 
+%package verify
+Summary:        Email verification for jabberd2
+Group:          Productivity/Networking/Other
+Requires:       %name = %version
+Requires:       /usr/bin/pwgen
+Requires:       /usr/lib/sendmail
+
+%description verify
+
+This package contains a filter module that blocks a new account until
+the user has entered a valid email address and proved that it is under
+his control by returning a token that gets sent there.
+
 %prep
 %setup -q
 %patch5
 touch -r configure.ac zzz
 %patch6
 touch configure.ac -r zzz
+%patch8
 
 %__sed -i 's/\r$//' tools/db-update.sqlite
 
@@ -134,7 +149,7 @@ CFLAGS="%optflags -fno-strict-aliasing"
     --enable-debug \
     --enable-tests \
     --enable-superseded
-make
+make %{?_smp_mflags}
 
 %if 0%{?suse_version} >= 1311
 %check
@@ -162,10 +177,8 @@ for mod in \
     iq-{last,ping,private,time,vcard,version} \
     offline pep presence privacy \
     roster-publish roster session status \
-    template-roster vacation validate verify; do
-    echo "%_libdir/%name/mod_${mod}.so" >>mods.lst
-    echo "%_libdir/%name/mod_${mod}.so.0" >>mods.lst
-    echo "%_libdir/%name/mod_${mod}.so.0.*" >>mods.lst
+    template-roster vacation validate; do
+    echo "%_libdir/%name/mod_${mod}.so*" >>mods.lst
 done
 
 %pre
@@ -200,9 +213,7 @@ exit 0
 %_libdir/%name/authreg_anon.so
 %_libdir/%name/authreg_pipe.so
 %_libdir/%name/storage_fs.so
-%_libdir/%name/libstorage.so
-%_libdir/%name/libstorage.so.0
-%_libdir/%name/libstorage.so.0.*
+%_libdir/%name/libstorage.so*
 %dir /etc/jabberd
 %dir /etc/jabberd/templates
 %config /etc/jabberd/*.xml.dist
@@ -251,4 +262,8 @@ exit 0
 %_libdir/%name/authreg_pam.so
 %config /etc/pam.d/*
 
+%files verify
+%defattr (-, root, root, -)
+%_libdir/%name/mod_verify.so*
+
 %changelog

Places

File project.diff of Package jabberd

Places