packages: cyrus-sasl/cyrus-sasl.spec, cyrus-sasl/cyrus-sasl-parallel-make.p...
draenog
draenog at pld-linux.org
Wed Dec 9 10:10:09 CET 2009
Author: draenog Date: Wed Dec 9 09:10:09 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- fix parallel building
---- Files affected:
packages/cyrus-sasl:
cyrus-sasl.spec (1.179 -> 1.180) , cyrus-sasl-parallel-make.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/cyrus-sasl/cyrus-sasl.spec
diff -u packages/cyrus-sasl/cyrus-sasl.spec:1.179 packages/cyrus-sasl/cyrus-sasl.spec:1.180
--- packages/cyrus-sasl/cyrus-sasl.spec:1.179 Fri Dec 4 01:04:41 2009
+++ packages/cyrus-sasl/cyrus-sasl.spec Wed Dec 9 10:10:03 2009
@@ -49,6 +49,7 @@
Patch10: %{name}-keytab.patch
Patch11: %{name}-sizes.patch
Patch12: %{name}-nagios-plugin.patch
+Patch13: %{name}-parallel-make.patch
URL: http://asg.web.cmu.edu/sasl/
BuildRequires: autoconf >= 2.54
BuildRequires: automake
@@ -456,6 +457,7 @@
%patch10 -p1
%patch11 -p1
%patch12 -p1
+%patch13 -p1
cd doc
echo "cyrus-sasl complies with the following RFCs:" > rfc-compliance
@@ -707,6 +709,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.180 2009/12/09 09:10:03 draenog
+- fix parallel building
+
Revision 1.179 2009/12/04 00:04:41 draenog
- up to 2.1.23 (CVE-2009-0688)
================================================================
Index: packages/cyrus-sasl/cyrus-sasl-parallel-make.patch
diff -u /dev/null packages/cyrus-sasl/cyrus-sasl-parallel-make.patch:1.1
--- /dev/null Wed Dec 9 10:10:09 2009
+++ packages/cyrus-sasl/cyrus-sasl-parallel-make.patch Wed Dec 9 10:10:03 2009
@@ -0,0 +1,47 @@
+diff -ur cyrus-sasl-2.1.23.orig/plugins/Makefile.am cyrus-sasl-2.1.23/plugins/Makefile.am
+--- cyrus-sasl-2.1.23.orig/plugins/Makefile.am 2009-12-09 08:19:06.981152890 +0000
++++ cyrus-sasl-2.1.23/plugins/Makefile.am 2009-12-09 08:33:41.561911411 +0000
+@@ -186,8 +186,8 @@
+
+ CLEANFILES=$(init_src)
+
+-${init_src}: $(srcdir)/makeinit.sh
+- $(SHELL) $(srcdir)/makeinit.sh
++${init_src}: $(srcdir)/makeinit.sh $@
++ $(SHELL) $(srcdir)/makeinit.sh $@
+
+ # Compatibility function build rules (they build in lib/)
+ $(COMPAT_OBJS):
+diff -ur cyrus-sasl-2.1.23.orig/plugins/makeinit.sh cyrus-sasl-2.1.23/plugins/makeinit.sh
+--- cyrus-sasl-2.1.23.orig/plugins/makeinit.sh 2009-12-09 08:19:06.921144397 +0000
++++ cyrus-sasl-2.1.23/plugins/makeinit.sh 2009-12-09 08:25:31.644442215 +0000
+@@ -1,5 +1,6 @@
+-for mech in anonymous crammd5 digestmd5 gssapiv2 kerberos4 login ntlm otp passdss plain srp; do
+-
++mech="${1%_init.c}"
++case "$mech" in
++ anonymous|crammd5|digestmd5|gssapiv2|kerberos4|login|ntlm|otp|passdss|plain|srp)
+ echo "
+ #include <config.h>
+
+@@ -43,10 +44,9 @@
+ SASL_CLIENT_PLUG_INIT( $mech )
+ SASL_SERVER_PLUG_INIT( $mech )
+ " > ${mech}_init.c
+-done
+-
+-for mech in sasldb mysql pgsql sqlite ldapdb; do
++;;
+
++ sasldb|mysql|pgsql|sqlite|ldapdb)
+ echo "
+ #include <config.h>
+
+@@ -85,5 +85,6 @@
+
+ SASL_AUXPROP_PLUG_INIT( $mech )
+ " > ${mech}_init.c
+-done
++;;
++esac
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cyrus-sasl/cyrus-sasl.spec?r1=1.179&r2=1.180&f=u
More information about the pld-cvs-commit
mailing list