pool/cyrus-sasl
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cyrus-sasl?expand=0&rev=12

Browse Source
This commit is contained in:
OBS User unknown 2009-05-18 22:46:09 +00:00 committed by Git OBS Bridge
parent fdd6e37272
commit 2742b76565
8 changed files with 204 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cyrus-sasl-2.1.22.dif
View File

@ -1,11 +0,0 @@
--- cmulocal/cyrus.m4
+++ cmulocal/cyrus.m4 2004/10/06 12:00:32
@@ -37,7 +37,7 @@
SAVE_LDFLAGS="${LDFLAGS}"
LDFLAGS="-R /usr/lib"
AC_TRY_LINK([],[],[andrew_runpath_switch="-R"], [
- LDFLAGS="-Wl,-rpath,/usr/lib"
+# LDFLAGS="-Wl,-rpath,/usr/lib"
AC_TRY_LINK([],[],[andrew_runpath_switch="-Wl,-rpath,"],
[andrew_runpath_switch="none"])
])

3
cyrus-sasl-2.1.22.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b16dc415fe2dcc8e8da6aa8bd079e8479fca2629e3833b72cfcdee2c3cdb83f0
size 1249025

3
cyrus-sasl-2.1.23.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:441dc9960262de54511653e4b9a7d7100443074c3540aebaa4bb552a691740f2
size 1287516

7
cyrus-sasl-saslauthd.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri May 15 14:23:03 CEST 2009 - rhafer@novell.com
- Update to 2.1.23, the only change is a fix for a potential buffer
overflow in sasl_encode64() (bnc#499104, CVE-2009-0688)
- Imported some automake/libtool fixes from upstream cvs
-------------------------------------------------------------------
Mon Mar 2 21:28:09 CET 2009 - crrodriguez@suse.de

27
cyrus-sasl-saslauthd.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package cyrus-sasl-saslauthd (Version 2.1.22)
# spec file for package cyrus-sasl-saslauthd (Version 2.1.23)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -27,14 +27,15 @@ AutoReqProv: on
Provides: cyrus-sasl:/usr/sbin/saslauthd
Provides: cyrus-sasl2:/usr/sbin/saslauthd
Summary: The SASL Authentication Server
Version: 2.1.22
Release: 183
Version: 2.1.23
Release: 1
Source: cyrus-sasl-%{version}.tar.bz2
Source1: cyrus-sasl-rc.tar.bz2
Patch: cyrus-sasl-%{version}.dif
Patch: cyrus-sasl.dif
Patch1: shared_link_on_ppc.patch
Patch2: cyrus-sasl-gcc4.patch
Patch3: cyrus-sasl-implicitfunc.dif
Patch4: cyrus-sasl-2.1.22-gcc44.patch
PreReq: %insserv_prereq %fillup_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -87,6 +88,7 @@ Authors:
%patch1
%patch2
%patch3 -p1
%patch4
%build
find . -name \*.cvsignore -print0 | xargs -0 rm -vf
@ -97,12 +99,17 @@ rm -f acinclude.m4
rm -f saslauthd/acinclude.m4
rm -rf autom4te.cache
rm -rf saslauthd/autom4te.cache
# libtoolize --force
# cyrus-sasl2 does not work, when using newer libtool
aclocal -I cmulocal -I config
libtoolize --force
aclocal -I cmulocal -I config
autoheader
autoconf
automake --add-missing --include-deps
autoconf
cd saslauthd
aclocal -I ../cmulocal -I config -I ../config
autoheader
autoconf
automake --add-missing --include-deps
cd -
export CFLAGS="-fno-strict-aliasing $RPM_OPT_FLAGS -DLDAP_DEPRECATED"
export CPPFLAGS=-I/usr/include/heimdal
@ -139,7 +146,6 @@ cd plugins
make DESTDIR=$RPM_BUILD_ROOT sasldir=%{_libdir}/sasl2 install
cd ..
cd saslauthd
#make DESTDIR=$RPM_BUILD_ROOT sasldir=%{_libdir}/sasl2 testsaslauthd
make DESTDIR=$RPM_BUILD_ROOT sasldir=%{_libdir}/sasl2 install
mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8
install -m 644 saslauthd.mdoc $RPM_BUILD_ROOT/%{_mandir}/man8/saslauthd.8
@ -164,7 +170,6 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/sasl2/libsql.la
%insserv_cleanup
%post
%run_ldconfig
%{fillup_and_insserv -n saslauthd}
%clean
@ -188,6 +193,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/sasl2/libldapdb.so*
%changelog
* Fri May 15 2009 rhafer@novell.com
- Update to 2.1.23, the only change is a fix for a potential buffer
overflow in sasl_encode64() (bnc#499104, CVE-2009-0688)
- Imported some automake/libtool fixes from upstream cvs
* Mon Mar 02 2009 crrodriguez@suse.de
- fix build with GCC 4.4
- remove all "la" files

7
cyrus-sasl.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri May 15 14:23:03 CEST 2009 - rhafer@novell.com
- Update to 2.1.23, the only change is a fix for a potential buffer
overflow in sasl_encode64() (bnc#499104, CVE-2009-0688)
- Imported some automake/libtool fixes from upstream cvs
-------------------------------------------------------------------
Mon Mar 2 21:28:09 CET 2009 - crrodriguez@suse.de

153
cyrus-sasl.dif Normal file
View File

@ -0,0 +1,153 @@
Index: cmulocal/cyrus.m4
===================================================================
--- cmulocal/cyrus.m4.orig
+++ cmulocal/cyrus.m4
@@ -37,7 +37,7 @@ AC_DEFUN([CMU_GUESS_RUNPATH_SWITCH], [
SAVE_LDFLAGS="${LDFLAGS}"
LDFLAGS="-R /usr/lib"
AC_TRY_LINK([],[],[andrew_runpath_switch="-R"], [
- LDFLAGS="-Wl,-rpath,/usr/lib"
+# LDFLAGS="-Wl,-rpath,/usr/lib"
AC_TRY_LINK([],[],[andrew_runpath_switch="-Wl,-rpath,"],
[andrew_runpath_switch="none"])
])
Index: Makefile.am
===================================================================
--- Makefile.am.orig
+++ Makefile.am
@@ -43,6 +43,7 @@ AUTOMAKE_OPTIONS = 1.7
#
################################################################
+ACLOCAL_AMFLAGS="-I config"
if SASLAUTHD
SAD = saslauthd
else
Index: configure.in
===================================================================
--- configure.in.orig
+++ configure.in
@@ -52,6 +52,7 @@ AC_CACHE_LOAD
fi
AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_MACRO_DIR([config])
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
Index: plugins/Makefile.am
===================================================================
--- plugins/Makefile.am.orig
+++ plugins/Makefile.am
@@ -46,23 +46,10 @@
# Library version info - here at the top, for sanity
# CURRENT:REVISION:AGE
-anonymous_version = 2:23:0
-digestmd5_version = 2:23:0
-kerberos4_version = 2:23:0
-gssapiv2_version = 2:23:0
-crammd5_version = 2:23:0
-passdss_version = 2:23:0
-sasldb_version = 2:23:0
-login_version = 2:23:0
-plain_version = 2:23:0
-ntlm_version = 2:23:0
-otp_version = 2:23:0
-sql_version = 2:23:0
-ldapdb_version = 2:23:0
-srp_version = 2:23:0
+plugin_version = 2:23: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)
+AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir) -version-info $(plugin_version)
COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@
@@ -82,73 +69,59 @@ EXTRA_LTLIBRARIES = libplain.la libanony
libntlm.la libpassdss.la libsasldb.la libsql.la libldapdb.la
libplain_la_SOURCES = plain.c plain_init.c $(common_sources)
-libplain_la_LDFLAGS = -version-info $(plain_version)
libplain_la_DEPENDENCIES = $(COMPAT_OBJS)
libplain_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS)
libanonymous_la_SOURCES = anonymous.c anonymous_init.c $(common_sources)
-libanonymous_la_LDFLAGS = -version-info $(anonymous_version)
libanonymous_la_DEPENDENCIES = $(COMPAT_OBJS)
libanonymous_la_LIBADD = $(COMPAT_OBJS)
libkerberos4_la_SOURCES = kerberos4.c kerberos4_init.c $(common_sources)
-libkerberos4_la_LDFLAGS = -version-info $(kerberos4_version)
libkerberos4_la_DEPENDENCIES = $(COMPAT_OBJS)
libkerberos4_la_LIBADD = $(SASL_KRB_LIB) $(LIB_SOCKET) $(COMPAT_OBJS)
libgssapiv2_la_SOURCES = gssapi.c gssapiv2_init.c $(common_sources)
-libgssapiv2_la_LDFLAGS = -version-info $(gssapiv2_version)
libgssapiv2_la_DEPENDENCIES = $(COMPAT_OBJS)
libgssapiv2_la_LIBADD = $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(LIB_SOCKET) $(COMPAT_OBJS)
libcrammd5_la_SOURCES = cram.c crammd5_init.c $(common_sources)
-libcrammd5_la_LDFLAGS = -version-info $(crammd5_version)
libcrammd5_la_DEPENDENCIES = $(COMPAT_OBJS)
libcrammd5_la_LIBADD = $(COMPAT_OBJS)
libdigestmd5_la_SOURCES = digestmd5.c digestmd5_init.c $(common_sources)
-libdigestmd5_la_LDFLAGS = -version-info $(digestmd5_version)
libdigestmd5_la_DEPENDENCIES = $(COMPAT_OBJS)
libdigestmd5_la_LIBADD = $(LIB_DES) $(LIB_SOCKET) $(COMPAT_OBJS)
liblogin_la_SOURCES = login.c login_init.c $(common_sources)
-liblogin_la_LDFLAGS = -version-info $(login_version)
liblogin_la_DEPENDENCIES = $(COMPAT_OBJS)
liblogin_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS)
libsrp_la_SOURCES = srp.c srp_init.c $(common_sources)
-libsrp_la_LDFLAGS = -version-info $(srp_version)
libsrp_la_DEPENDENCIES = $(COMPAT_OBJS)
libsrp_la_LIBADD = $(SRP_LIBS) $(COMPAT_OBJS)
libotp_la_SOURCES = otp.c otp_init.c otp.h $(common_sources)
-libotp_la_LDFLAGS = -version-info $(otp_version)
libotp_la_DEPENDENCIES = $(COMPAT_OBJS)
libotp_la_LIBADD = $(OTP_LIBS) $(COMPAT_OBJS)
libntlm_la_SOURCES = ntlm.c ntlm_init.c $(common_sources)
-libntlm_la_LDFLAGS = -version-info $(ntlm_version)
libntlm_la_DEPENDENCIES = $(COMPAT_OBJS)
libntlm_la_LIBADD = $(NTLM_LIBS) $(COMPAT_OBJS)
libpassdss_la_SOURCES = passdss.c passdss_init.c $(common_sources)
-libpassdss_la_LDFLAGS = -version-info $(passdss_version)
libpassdss_la_DEPENDENCIES = $(COMPAT_OBJS)
libpassdss_la_LIBADD = $(PASSDSS_LIBS) $(COMPAT_OBJS)
# Auxprop Plugins
libsasldb_la_SOURCES = sasldb.c sasldb_init.c $(common_sources)
-libsasldb_la_LDFLAGS = -version-info $(sasldb_version)
libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS)
libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS)
libldapdb_la_SOURCES = ldapdb.c ldapdb_init.c $(common_sources)
-libldapdb_la_LDFLAGS = $(LIB_LDAP) -version-info $(ldapdb_version)
libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS)
libldapdb_la_LIBADD = $(COMPAT_OBJS)
libsql_la_SOURCES = sql.c sql_init.c $(common_sources)
-libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version)
libsql_la_DEPENDENCIES = $(COMPAT_OBJS)
libsql_la_LIBADD = $(COMPAT_OBJS)
Index: sasldb/Makefile.am
===================================================================
--- sasldb/Makefile.am.orig
+++ sasldb/Makefile.am
@@ -48,6 +48,7 @@ INCLUDES=-I$(top_srcdir)/include -I$(top
extra_common_sources = db_none.c db_ndbm.c db_gdbm.c db_berkeley.c
+AM_CFLAGS = "-fPIC"
EXTRA_DIST = NTMakefile
noinst_LTLIBRARIES = libsasldb.la

27
cyrus-sasl.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package cyrus-sasl (Version 2.1.22)
# spec file for package cyrus-sasl (Version 2.1.23)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -19,8 +19,8 @@
Name: cyrus-sasl
Version: 2.1.22
Release: 174
Version: 2.1.23
Release: 1
BuildRequires: db-devel krb5-devel openssl-devel opie pam-devel
Obsoletes: cyrus-sasl2 <= %{version}
Provides: cyrus-sasl2 = %{version}
@ -37,7 +37,7 @@ Summary: Implementation of Cyrus SASL API
Source: cyrus-sasl-%{version}.tar.bz2
Source1: cyrus-sasl-rc.tar.bz2
Source2: README.Source
Patch: cyrus-sasl-%{version}.dif
Patch: cyrus-sasl.dif
Patch1: shared_link_on_ppc.patch
Patch2: cyrus-sasl-gcc4.patch
Patch3: cyrus-sasl-implicitfunc.dif
@ -233,12 +233,17 @@ rm -f acinclude.m4
rm -f saslauthd/acinclude.m4
rm -rf autom4te.cache
rm -rf saslauthd/autom4te.cache
# libtoolize --force
# cyrus-sasl2 does not work, when using newer libtool
aclocal -I cmulocal -I config
libtoolize --force
aclocal -I cmulocal -I config
autoheader
autoconf
automake --add-missing --include-deps
autoconf
cd saslauthd
aclocal -I ../cmulocal -I config -I ../config
autoheader
autoconf
automake --add-missing --include-deps
cd -
export CFLAGS="-fno-strict-aliasing $RPM_OPT_FLAGS"
export CPPFLAGS=-I/usr/include/heimdal
@ -265,10 +270,6 @@ install -m 755 sample/.libs/client $RPM_BUILD_ROOT/usr/bin/cyrus_sasl_sample_cli
install -m 755 sample/.libs/server $RPM_BUILD_ROOT/usr/bin/cyrus_sasl_sample_server
chmod 0644 doc/*
rm -f doc/Makefile*
cd utils
gcc -Wall -W -O2 -fmessage-length=0 -o dbconverter dbconverter-2.o ../sasldb/.libs/libsasldb.al -lresolv ../lib/.libs/libsasl2.so -ldl -ldb
#gcc -Wall -W -O2 -fmessage-length=0 -o dbconverter dbconverter-2.o ../sasldb/.libs/libsasldb.al -lresolv ../lib/.libs/libsasl2.so -ldl -ldb -Wl,--rpath -Wl,/usr/src/packages/BUILD/cyrus-sasl-2.1.12/lib/.libs
install -m 755 dbconverter $RPM_BUILD_ROOT/usr/sbin/dbconverter
rm -f $RPM_BUILD_ROOT/%{_mandir}/cat?/*
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/saslauthd*
rm -f $RPM_BUILD_ROOT/usr/sbin/saslauthd
@ -330,6 +331,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libsasl2.so
%changelog
* Fri May 15 2009 rhafer@novell.com
- Update to 2.1.23, the only change is a fix for a potential buffer
overflow in sasl_encode64() (bnc#499104, CVE-2009-0688)
- Imported some automake/libtool fixes from upstream cvs
* Mon Mar 02 2009 crrodriguez@suse.de
- fix build with GCC 4.4
- remove all "la" files