From 299f8f5911d6e5df25148aea38c8289911ee9b25d1353ed69cd469867c2edc02 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 26 Oct 2007 18:32:16 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cyrus-sasl?expand=0&rev=3 --- cyrus-sasl-rc.tar.bz2 | 3 +++ cyrus-sasl-rc.tar.gz | 3 --- cyrus-sasl-saslauthd.changes | 7 +++++ cyrus-sasl-saslauthd.spec | 28 ++++++++++--------- cyrus-sasl.changes | 7 +++++ cyrus-sasl.spec | 52 +++++++++++++++++++----------------- 6 files changed, 59 insertions(+), 41 deletions(-) create mode 100644 cyrus-sasl-rc.tar.bz2 delete mode 100644 cyrus-sasl-rc.tar.gz diff --git a/cyrus-sasl-rc.tar.bz2 b/cyrus-sasl-rc.tar.bz2 new file mode 100644 index 0000000..1977b33 --- /dev/null +++ b/cyrus-sasl-rc.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:910e2865d7f585158a0bfe9bd57f6db39b4a4d8235f823571e41dfa3386b4e48 +size 2038 diff --git a/cyrus-sasl-rc.tar.gz b/cyrus-sasl-rc.tar.gz deleted file mode 100644 index ed061a4..0000000 --- a/cyrus-sasl-rc.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8591c78425fadc73f514cc5a739e7ced4a11452e7fbcc5a4e27e8159e0a569ce -size 2026 diff --git a/cyrus-sasl-saslauthd.changes b/cyrus-sasl-saslauthd.changes index 02d2cb2..3ba06c5 100644 --- a/cyrus-sasl-saslauthd.changes +++ b/cyrus-sasl-saslauthd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Oct 26 16:40:22 CEST 2007 - rhafer@suse.de + +- Fixed some RPMLINT complaints +- re-enabled accidently disabled "kerberos5" authmech for saslauthd + (Bug #335754) + ------------------------------------------------------------------- Tue Mar 20 10:13:29 CET 2007 - rhafer@suse.de diff --git a/cyrus-sasl-saslauthd.spec b/cyrus-sasl-saslauthd.spec index 0ea196e..e4ac4de 100644 --- a/cyrus-sasl-saslauthd.spec +++ b/cyrus-sasl-saslauthd.spec @@ -12,27 +12,27 @@ Name: cyrus-sasl-saslauthd BuildRequires: db-devel krb5-devel mysql-devel openldap2-devel opie pam-devel postgresql-devel -License: BSD License and BSD-like +License: BSD 4-Clause Group: Productivity/Networking/Other -URL: http://asg.web.cmu.edu/sasl/ -Autoreqprov: on +Url: http://asg.web.cmu.edu/sasl/ +AutoReqProv: on Provides: cyrus-sasl:/usr/sbin/saslauthd Provides: cyrus-sasl2:/usr/sbin/saslauthd Summary: The SASL Authentication Server Version: 2.1.22 -Release: 38 +Release: 92 Source: cyrus-sasl-%{version}.tar.bz2 -Source1: cyrus-sasl-rc.tar.gz +Source1: cyrus-sasl-rc.tar.bz2 Patch: cyrus-sasl-%{version}.dif Patch1: shared_link_on_ppc.patch Patch2: cyrus-sasl-gcc4.patch Patch3: cyrus-sasl-implicitfunc.dif -Prereq: %insserv_prereq %fillup_prereq +PreReq: %insserv_prereq %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This daemon is required when using cyrus-sasl in server software that -should, for example, authenticate with PAM. +should authenticate with PAM, for example. @@ -42,9 +42,8 @@ Authors: %package -n cyrus-sasl-ldap-auxprop Summary: The cyrus-sasl LDAP auxprop plugin -Autoreqprov: on +AutoReqProv: on Group: Productivity/Networking/Other -Prefix: %{_prefix} Requires: cyrus-sasl %description -n cyrus-sasl-ldap-auxprop @@ -59,9 +58,8 @@ Authors: %package -n cyrus-sasl-sqlauxprop Summary: cyrus-sasl SQL auxprop plugin -Autoreqprov: on +AutoReqProv: on Group: Development/Libraries/C and C++ -Prefix: %{_prefix} Requires: cyrus-sasl %description -n cyrus-sasl-sqlauxprop @@ -116,7 +114,7 @@ export CPPFLAGS=-I/usr/include/heimdal --enable-passdss=no \ --enable-sample=no \ --enable-login=no \ - --enable-gssapi=no \ + --enable-gssapi=yes \ --enable-krb4=no \ --enable-sql \ --with-mysql=/usr/include/mysql \ @@ -143,6 +141,7 @@ mkdir -p $RPM_BUILD_ROOT/sbin ln -sf ../etc/init.d/saslauthd $RPM_BUILD_ROOT/sbin/rcsaslauthd install -D -m 644 SuSE/sysconfig.saslauthd $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.saslauthd rm -f $RPM_BUILD_ROOT/%{_mandir}/cat?/* +rm -f $RPM_BUILD_ROOT/%{_libdir}/sasl2/libgssapiv2.* rm -f $RPM_BUILD_ROOT/%{_libdir}/sasl2/libsasldb* rm -f $RPM_BUILD_ROOT/%{_libdir}/sasl2/libldapdb.la rm -f $RPM_BUILD_ROOT/%{_libdir}/sasl2/libsql.la @@ -177,8 +176,11 @@ rm -rf $RPM_BUILD_ROOT %files -n cyrus-sasl-ldap-auxprop %defattr(-,root,root) %{_libdir}/sasl2/libldapdb.so* - %changelog +* Fri Oct 26 2007 - rhafer@suse.de +- Fixed some RPMLINT complaints +- re-enabled accidently disabled "kerberos5" authmech for saslauthd + (Bug #335754) * Tue Mar 20 2007 - rhafer@suse.de - Add SASLAUTHD_THREADS to /etc/sysconfig/saslauthd to be able to set the number of threads that saslauthd should spawn diff --git a/cyrus-sasl.changes b/cyrus-sasl.changes index 02d2cb2..3ba06c5 100644 --- a/cyrus-sasl.changes +++ b/cyrus-sasl.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Oct 26 16:40:22 CEST 2007 - rhafer@suse.de + +- Fixed some RPMLINT complaints +- re-enabled accidently disabled "kerberos5" authmech for saslauthd + (Bug #335754) + ------------------------------------------------------------------- Tue Mar 20 10:13:29 CET 2007 - rhafer@suse.de diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec index 42c360e..6eed606 100644 --- a/cyrus-sasl.spec +++ b/cyrus-sasl.spec @@ -14,75 +14,75 @@ Name: cyrus-sasl BuildRequires: db-devel krb5-devel openssl-devel opie pam-devel Obsoletes: cyrus-sasl2 Provides: cyrus-sasl2 -License: BSD License and BSD-like +License: BSD 4-Clause Group: Productivity/Networking/Other -URL: http://asg.web.cmu.edu/sasl/ -Autoreqprov: on +Url: http://asg.web.cmu.edu/sasl/ +AutoReqProv: on Summary: Implementation of Cyrus SASL API Version: 2.1.22 -Release: 38 +Release: 89 Source: cyrus-sasl-%{version}.tar.bz2 -Source1: cyrus-sasl-rc.tar.gz +Source1: cyrus-sasl-rc.tar.bz2 Source2: README.Source Patch: cyrus-sasl-%{version}.dif Patch1: shared_link_on_ppc.patch Patch2: cyrus-sasl-gcc4.patch Patch3: cyrus-sasl-implicitfunc.dif -Prereq: %insserv_prereq %fillup_prereq +PreReq: %insserv_prereq %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build # + %package gssapi Obsoletes: cyrus-sasl2-gssapi Provides: cyrus-sasl2-gssapi Summary: cyrus-sasl plugin for the GSSAPI mechanism -Autoreqprov: on +AutoReqProv: on Group: Development/Libraries/C and C++ -Prefix: %{_prefix} Requires: cyrus-sasl # + %package crammd5 Summary: cyrus-sasl plugin for the CRAMMD5 mechanism -Autoreqprov: on +AutoReqProv: on Group: Development/Libraries/C and C++ -Prefix: %{_prefix} Requires: cyrus-sasl Provides: cyrus-sasl:%{_libdir}/sasl2/libcrammd5.so Provides: cyrus-sasl2:%{_libdir}/sasl2/libcrammd5.so # + %package digestmd5 Summary: cyrus-sasl plugin for the DIGESTMD5 mechanism -Autoreqprov: on +AutoReqProv: on Group: Development/Libraries/C and C++ -Prefix: %{_prefix} Requires: cyrus-sasl Provides: cyrus-sasl:%{_libdir}/sasl2/libdigestmd5.so Provides: cyrus-sasl2:%{_libdir}/sasl2/libdigestmd5.so # + %package otp Summary: cyrus-sasl plugin for the OTP mechanism -Autoreqprov: on +AutoReqProv: on Group: Development/Libraries/C and C++ -Prefix: %{_prefix} Requires: cyrus-sasl Provides: cyrus-sasl:%{_libdir}/sasl2/libotp.so Provides: cyrus-sasl2:%{_libdir}/sasl2/libotp.so # + %package plain Summary: cyrus-sasl plugin for the PLAIN mechanism -Autoreqprov: on +AutoReqProv: on Group: Development/Libraries/C and C++ -Prefix: %{_prefix} Requires: cyrus-sasl Provides: cyrus-sasl:%{_libdir}/sasl2/libplain.so Provides: cyrus-sasl2:%{_libdir}/sasl2/libplain.so # + %package devel Obsoletes: cyrus-sasl2-devel Provides: cyrus-sasl2-devel Summary: Cyrus SASL API Implementation, Libraries and Header Files -Autoreqprov: on +AutoReqProv: on Group: Development/Libraries/C and C++ -Prefix: %{_prefix} Requires: cyrus-sasl = %{version}, glibc-devel %description @@ -95,7 +95,6 @@ Authors: -------- tech-transfer@andrew.cmu.edu - %description gssapi This is the Cyrus SASL API implementation. It can be used on the client or server side to provide authentication. See RFC 2222 for more @@ -107,7 +106,6 @@ Authors: -------- tech-transfer@andrew.cmu.edu - %description devel This is the Cyrus SASL API. It can be used on the client or server side to provide authentication. See RFC 2222 for more information. @@ -118,7 +116,6 @@ Authors: -------- tech-transfer@andrew.cmu.edu - %description digestmd5 This is the Cyrus SASL API implementation. It can be used on the client or server side to provide authentication. See RFC 2222 for more @@ -130,7 +127,6 @@ Authors: -------- tech-transfer@andrew.cmu.edu - %description crammd5 This is the Cyrus SASL API implementation. It can be used on the client or server side to provide authentication. See RFC 2222 for more @@ -142,7 +138,6 @@ Authors: -------- tech-transfer@andrew.cmu.edu - %description otp This is the Cyrus SASL API implementation. It can be used on the client or server side to provide authentication. See RFC 2222 for more @@ -154,7 +149,6 @@ Authors: -------- tech-transfer@andrew.cmu.edu - %description plain This is the Cyrus SASL API implementation. It can be used on the client or server side to provide authentication. See RFC 2222 for more @@ -219,6 +213,8 @@ mkdir -p $RPM_BUILD_ROOT/usr/bin mkdir -p $RPM_BUILD_ROOT/etc/sasl2 install -m 755 sample/.libs/client $RPM_BUILD_ROOT/usr/bin/cyrus_sasl_sample_client 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 @@ -232,6 +228,9 @@ find $RPM_BUILD_ROOT/%{_libdir}/sasl2 -name "*.la" | xargs rm -f %post %run_ldconfig +%postun +%run_ldconfig + %clean rm -rf $RPM_BUILD_ROOT @@ -278,8 +277,11 @@ rm -rf $RPM_BUILD_ROOT %doc %{_mandir}/man3/sasl_*.gz %{_libdir}/libsasl2.so %{_libdir}/libsasl2.la - %changelog +* Fri Oct 26 2007 - rhafer@suse.de +- Fixed some RPMLINT complaints +- re-enabled accidently disabled "kerberos5" authmech for saslauthd + (Bug #335754) * Tue Mar 20 2007 - rhafer@suse.de - Add SASLAUTHD_THREADS to /etc/sysconfig/saslauthd to be able to set the number of threads that saslauthd should spawn