SF.net SVN: gar:[23454] csw/mgar/pkg/sasl/trunk

Tue Apr 22 00:33:46 CEST 2014

Revision: 23454
          http://sourceforge.net/p/gar/code/23454
Author:   chninkel
Date:     2014-04-21 22:33:45 +0000 (Mon, 21 Apr 2014)
Log Message:
-----------
sasl/trunk: revert libsasl soname

Modified Paths:
--------------
    csw/mgar/pkg/sasl/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/sasl/trunk/files/0045_revert_upstream_soname_bump.patch

Modified: csw/mgar/pkg/sasl/trunk/Makefile
===================================================================

--- csw/mgar/pkg/sasl/trunk/Makefile	2014-04-21 21:14:28 UTC (rev 23453)
+++ csw/mgar/pkg/sasl/trunk/Makefile	2014-04-21 22:33:45 UTC (rev 23454)
@@ -40,15 +40,27 @@
 # it's not the case
 PATCHFILES += 0003-remove-gethostname-re-definition-on-sun.patch
 
+
+# Like Debian, we don't follow upstream soname bump as:
+#  - the ABI breakage was already done since 2.1.23 and didn't break anything,
+#  - the only impact would have been on openldap and it is handled on that side
+# see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=628237
+# and https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=665476
+PATCHFILES += 0045_revert_upstream_soname_bump.patch
+
+
 VENDOR_URL = http://asg.web.cmu.edu/sasl/
 
 PACKAGES += CSWsasl
 SPKG_DESC_CSWsasl = Cyrus Simple Authentication and Security Layer
 RUNTIME_DEP_PKGS_CSWsasl += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWsasl += CSWbdb48
-RUNTIME_DEP_PKGS_CSWsasl += CSWlibsasl2-3
-CHECKPKG_OVERRIDES_CSWsasl += surplus-dependency|CSWlibsasl2-3
+RUNTIME_DEP_PKGS_CSWsasl += CSWlibsasl2-2
+CHECKPKG_OVERRIDES_CSWsasl += surplus-dependency|CSWlibsasl2-2
 
+CHECKPKG_OVERRIDES_CSWsaslsql += surplus-dependency|CSWlibmysqlclient18
+
+
 # The sasl package contains the sasl modules which are .so files
 # This is normal even if it's not a  developement package
 CHECKPKG_OVERRIDES_CSWsasl += shared-lib-package-contains-so-symlink
@@ -77,7 +89,7 @@
 CATALOGNAME_CSWsaslgssapi = sasl_gssapi
 SPKG_DESC_CSWsaslgssapi = Cyrus Simple Authentication and Security Layer GSSAPI Binding
 RUNTIME_DEP_PKGS_CSWsaslgssapi = CSWsasl 
-RUNTIME_DEP_PKGS_CSWsaslgssapi += CSWlibgssapi-krb5-2
+RUNTIME_DEP_PKGS_CSWsaslgssapi += CSWlibkrb5-3
 CHECKPKG_OVERRIDES_CSWsaslgssapi += catalogname-does-not-match-pkgname|pkgname=CSWsaslgssapi|catalogname=sasl_gssapi|expected-catalogname=saslgssapi
 PKGFILES_CSWsaslgssapi = $(call pkgfiles_lib,sasl2/libgs2.so)
 PKGFILES_CSWsaslgssapi += $(call pkgfiles_lib,sasl2/libgssapiv2.so)
@@ -96,14 +108,14 @@
 CHECKPKG_OVERRIDES_CSWsaslsql += catalogname-does-not-match-pkgname|pkgname=CSWsaslsql|catalogname=sasl_sql|expected-catalogname=saslsql
 PKGFILES_CSWsaslsql = $(call pkgfiles_lib,sasl2/libsql.so)
 
-PACKAGES += CSWlibsasl2-3
-SPKG_DESC_CSWlibsasl2-3 = Simple authentication and security layer library, libsasl2.so.2
-PKGFILES_CSWlibsasl2-3 += $(call pkgfiles_lib,libsasl2.so.3)
+PACKAGES += CSWlibsasl2-2
+SPKG_DESC_CSWlibsasl2-2 = Simple authentication and security layer library, libsasl2.so.2
+PKGFILES_CSWlibsasl2-2 += $(call pkgfiles_lib,libsasl2.so.2)
 
 PACKAGES += CSWsasl-dev
 SPKG_DESC_CSWsasl-dev = Development files for SASL
 PKGFILES_CSWsasl-dev += $(PKGFILES_DEVEL)
-RUNTIME_DEP_PKGS_CSWsasl-dev += CSWlibsasl2-3
+RUNTIME_DEP_PKGS_CSWsasl-dev += CSWlibsasl2-2
 RUNTIME_DEP_PKGS_CSWsasl-dev += CSWsasl
 
 
@@ -111,8 +123,8 @@
 CATALOGNAME_CSWsaslsample = sasl_sample
 SPKG_DESC_CSWsaslsample = Cyrus Simple Authentication and Security Layer sample client/server
 RUNTIME_DEP_PKGS_CSWsaslsample = CSWsasl
-RUNTIME_DEP_PKGS_CSWsaslsample += CSWlibsasl2-3
-RUNTIME_DEP_PKGS_CSWsaslsample += CSWlibgssapi-krb5-2
+RUNTIME_DEP_PKGS_CSWsaslsample += CSWlibsasl2-2
+RUNTIME_DEP_PKGS_CSWsaslsample += CSWlibkrb5-3
 PKGFILES_CSWsaslsample = $(bindir)/sasl-sample-server
 PKGFILES_CSWsaslsample += $(bindir)/sasl-sample-client
 # The plugins of CSWsasl are needed, else the functionality

Added: csw/mgar/pkg/sasl/trunk/files/0045_revert_upstream_soname_bump.patch
===================================================================
--- csw/mgar/pkg/sasl/trunk/files/0045_revert_upstream_soname_bump.patch	                        (rev 0)
+++ csw/mgar/pkg/sasl/trunk/files/0045_revert_upstream_soname_bump.patch	2014-04-21 22:33:45 UTC (rev 23454)
@@ -0,0 +1,46 @@
+Author: Roberto C. Sanchez <roberto at connexer.com>
+Description: Revert upstream's SONAME bump, which was introduced in upstream version 2.1.26.  SONAME breakage was previously handled in Debian and a bump is not required at this time.
+--- cyrus-sasl2.git.orig/lib/Makefile.am
++++ cyrus-sasl2.git/lib/Makefile.am
+@@ -43,7 +43,7 @@
+ # Library version info - here at the top, for sanity
+ # See <http://www.gnu.org/software/libtool/manual/libtool.html#Versioning>
+ # CURRENT:REVISION:AGE
+-sasl_version = 3:0:0
++sasl_version = 2:25:0
+ 
+ INCLUDES=-DLIBSASL_EXPORTS=1 -I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb
+ 
+--- cyrus-sasl2.git.orig/lib/Makefile.in
++++ cyrus-sasl2.git/lib/Makefile.in
+@@ -319,7 +319,7 @@
+ # Library version info - here at the top, for sanity
+ # See <http://www.gnu.org/software/libtool/manual/libtool.html#Versioning>
+ # CURRENT:REVISION:AGE
+-sasl_version = 3:0:0
++sasl_version = 2:25:0
+ INCLUDES = -DLIBSASL_EXPORTS=1 -I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb
+ EXTRA_DIST = windlopen.c staticopen.h NTMakefile
+ EXTRA_LIBRARIES = libsasl2.a
+--- cyrus-sasl2.git.orig/plugins/Makefile.am
++++ cyrus-sasl2.git/plugins/Makefile.am
+@@ -47,7 +47,7 @@
+ # Library version info - here at the top, for sanity
+ # See <http://www.gnu.org/software/libtool/manual/libtool.html#Versioning>
+ # CURRENT:REVISION:AGE
+-plugin_version = 3:0:0
++plugin_version = 2:25:0
+ 
+ INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include
+ AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir) -version-info $(plugin_version)
+--- cyrus-sasl2.git.orig/plugins/Makefile.in
++++ cyrus-sasl2.git/plugins/Makefile.in
+@@ -362,7 +362,7 @@
+ # Library version info - here at the top, for sanity
+ # See <http://www.gnu.org/software/libtool/manual/libtool.html#Versioning>
+ # CURRENT:REVISION:AGE
+-plugin_version = 3:0:0
++plugin_version = 2:25:0
+ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include
+ AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir) -version-info $(plugin_version)
+ COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

