cyrus-sasl 2.1.26-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8196 ec354946-7b23-47d6-9f5a-488ba84defc7

c/cyrus-sasl/cyrus-sasl-vl.spec

@@ -1,57 +1,35 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
-%define cs1_version 1.5.28
-%define _plugindir %{_libdir}/sasl
 %define _plugindir2 %{_libdir}/sasl2
 
-# No package in the current VineSeed tree needs Version 1 support
-%define includev1 0
-
 Summary: The Cyrus SASL library.
 Name: cyrus-sasl
-Version: 2.1.23
-Release: 11%{_dist_release}
-License: BSD
+Version: 2.1.26
+Release: 1%{_dist_release}
+License: BSD with advertising
 Group: System Environment/Libraries
-Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-%{version}.tar.gz
-Source1: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-%{version}.tar.gz.sig
-Source2: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-%{cs1_version}.tar.gz
-Source3: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-%{cs1_version}.tar.gz.sig
+Source0: ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-%{version}.tar.gz
 Source4: saslauthd.init
 Source5: README.RPM
 Source9: saslauthd.sysconfig
-URL: http://asg.web.cmu.edu/sasl/sasl-library.html
-#
-Patch0: cyrus-sasl-1.5.24-rpath.patch
-Patch1: cyrus-sasl-1.5.28-autoconf25.patch
-Patch2: cyrus-sasl-1.5.28-automake17.patch
-Patch3: cyrus-sasl-1.5.28-automake18.patch
-Patch4: cyrus-sasl-1.5.28-saslauthd2.patch
-Patch5: cyrus-sasl-1.5.28_CVE-2009-0688.patch
+URL: http://cyrusimap.org/
 #
 Patch10: cyrus-sasl-2.1.22-db_bundle.patch
-Patch11: cyrus-sasl-2.1.18-no_rpath.patch
+Patch11: cyrus-sasl-2.1.25-no_rpath.patch
 Patch15: cyrus-sasl-2.1.20-saslauthd.conf-path.patch
 Patch24: cyrus-sasl-2.1.21-sizes.patch
-Patch25: cyrus-sasl-2.1.22-typo.patch
-Patch26: cyrus-sasl-2.1.22-digest-commas.patch
-Patch27: cyrus-sasl-2.1.22-automake-1.10.patch
-Patch28: cyrus-sasl-2.1.21-keytab.patch
+Patch28: cyrus-sasl-2.1.26-keytab.patch
 
-Patch100: cyrus-sasl-2.1.22-db4.patch
-Patch101: cyrus-sasl-2.1.23-gcc44.patch
-Patch102: configure.patch
+Patch102: cyrus-sasl-2.1.26-configure.patch
 
 #security
-Patch200: cyrus-sasl-2.1.23_CVE-2013-4122.patch
+## http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-CVE-2013-4122.patch?revision=1.1
+Patch200: cyrus-sasl-2.1.26-CVE-2013-4122.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: autoconf, automake, libtool
 # Note: berkeley db for sasl2, gdbm for sasl1.
 BuildRequires: db4-devel, openssl-devel, pam-devel
-%if %{includev1}
-BuildRequires: gdbm-devel
-%endif
 BuildRequires: MySQL-devel, postgresql-devel, openldap-devel, zlib-devel
 BuildRequires: pkgconfig
 BuildRequires: krb5-devel
@@ -135,6 +113,23 @@ Summary: LDAP auxprop support for Cyrus SASL
 The %{name}-ldap package contains the Cyrus SASL plugin which supports using
 a directory server, accessed using LDAP, for storing shared secrets.
 
+%package scram
+Requires: %{name} = %{version}-%{release}
+Group: System Environment/Libraries
+Summary: SCRAM auxprop support for Cyrus SASL
+
+%description scram
+The %{name}-scram package contains the Cyrus SASL plugin which supports
+the SCRAM authentication scheme.
+
+%package gs2
+Requires: %{name} = %{version}-%{release}
+Group: System Environment/Libraries
+Summary: GS2 support for Cyrus SASL
+
+%description gs2
+The %{name}-gs2 package contains the Cyrus SASL plugin which supports
+the GS2 authentication scheme.
 
 ## to build compat32 for x86_64 architecture support
 %package -n compat32-%{name}
@@ -203,39 +198,35 @@ Summary: LDAP auxprop support for Cyrus SASL
 The %{name}-ldap package contains the Cyrus SASL plugin which supports using
 a directory server, accessed using LDAP, for storing shared secrets.
 
-%prep
-%setup -q -c -a 2
-%if %{includev1}
-pushd cyrus-sasl-%{cs1_version}
-%patch0 -p1 -b .rpath
-%patch1 -p1 -b .autoconf25
-%patch2 -p1 -b .automake17
-%patch3 -p1 -b .automake18
-%patch4 -p1 -b .saslauthd2
-%patch5 -p1 -b .CVE-2009-0688
-libtoolize -f -c
-aclocal -I config -I cmulocal
-automake -a -c -f
-autoheader
-autoconf -f
-popd
-%endif
+%package -n compat32-%{name}-scram
+Requires: %{name}-lib%{?_isa} = %{version}-%{release}
+Group: System Environment/Libraries
+Summary: SCRAM auxprop support for Cyrus SASL
+
+%description -n compat32-%{name}-scram
+The %{name}-scram package contains the Cyrus SASL plugin which supports
+the SCRAM authentication scheme.
+
+%package -n compat32-%{name}-gs2
+Requires: %{name}-lib%{?_isa} = %{version}-%{release}
+Group: System Environment/Libraries
+Summary: GS2 support for Cyrus SASL
 
-pushd cyrus-sasl-%{version}
+%description -n compat32-%{name}-gs2
+The %{name}-gs2 package contains the Cyrus SASL plugin which supports
+the GS2 authentication scheme.
+
+%prep
+%setup -q
 chmod -x doc/*.html
 chmod -x include/*.h
 %patch10 -p1 -b .db_bundle
 %patch11 -p1 -b .no_rpath
 %patch15 -p1 -b .path
 %patch24 -p1 -b .sizes
-%patch25 -p1 -b .typo
-%patch26 -p2 -b .digest-commas
-%patch27 -p1 -b .automake-1.10
 %patch28 -p1 -b .keytab
 
-%patch100 -p1 -b .db48
-%patch101 -p1 -b .gcc44
-%patch102 -p0 -b .configure
+%patch102 -p1 -b .configure
 
 %patch200 -p1 -b .CVE-2013-4122
 
@@ -261,41 +252,7 @@ autoheader
 autoconf
 popd
 
-%if %{includev1}
-# Sort of merge the docs.
-mkdir cyrus-sasl-%{version}/%{cs1_version}
-mkdir cyrus-sasl-%{version}/%{cs1_version}-devel
-cp %{name}-%{cs1_version}/{AUTHORS,COPYING,NEWS,README,doc/*.html} cyrus-sasl-%{version}/%{cs1_version}
-cp %{name}-%{cs1_version}/doc/*.txt cyrus-sasl-%{version}/%{cs1_version}-devel
-# Remove duplicate RFCs.
-pushd cyrus-sasl-%{version}/%{cs1_version}-devel
-for file in * ; do
-	if [ -f ../doc/${file} ] ; then
-		rm -f ${file}
-	fi
-done
-popd
-%endif
-
 %build
-%if %{includev1}
-pushd cyrus-sasl-%{cs1_version}
-%configure \
-	--enable-static --enable-staticdlopen --with-pic --enable-shared \
-	--with-plugindir=%{_plugindir} \
-	--disable-krb4 \
-	--with-rc4 \
-	--with-dblib=gdbm \
-	--enable-anon \
-	--enable-cram \
-	--enable-digest \
-	--enable-plain \
-	--enable-login
-make %{?_smp_mflags} sasldir=%{_plugindir}
-popd
-%endif
-
-pushd cyrus-sasl-%{version}
 CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
 
 # Find OpenSSL.
@@ -352,22 +309,9 @@ LDFLAGS=`echo $LDFLAGS $SQL_LDFLAGS | cleanup_flags`; export LDFLAGS
 make %{?_smp_mflags} sasldir=%{_plugindir2}
 make %{?_smp_mflags} -C saslauthd testsaslauthd
 make -C sample
-popd
 
 %install
 test "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT
-%if %{includev1}
-pushd cyrus-sasl-%{cs1_version}
-%makeinstall sasldir=$RPM_BUILD_ROOT/%{_plugindir}
-install -m755 -d $RPM_BUILD_ROOT%{_bindir}
-libtool --mode=install \
-install -m755 sample/client $RPM_BUILD_ROOT%{_bindir}/sasl-sample-client
-libtool --mode=install \
-install -m755 sample/server $RPM_BUILD_ROOT%{_bindir}/sasl-sample-server
-popd
-%endif
-
-pushd cyrus-sasl-%{version}
 make install DESTDIR=$RPM_BUILD_ROOT sasldir=%{_plugindir2}
 make install DESTDIR=$RPM_BUILD_ROOT sasldir=%{_plugindir2} -C plugins
 
@@ -393,7 +337,6 @@ install -m755 -d $RPM_BUILD_ROOT/var/run/saslauthd
 install -m755 -d $RPM_BUILD_ROOT/etc/rc.d/init.d $RPM_BUILD_ROOT/etc/sysconfig
 install -m755 -p %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/saslauthd
 install -m644 -p %{SOURCE9} $RPM_BUILD_ROOT/etc/sysconfig/saslauthd
-popd
 
 # Install the config dirs if they're not already there.
 install -m755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/sasl2
@@ -426,29 +369,15 @@ fi
 
 %files
 %defattr(-,root,root)
-%if %{includev1}
-%doc %{name}-%{version}/%{cs1_version}
-%endif
-%doc %{name}-%{version}/{AUTHORS,COPYING,NEWS,README,doc/*.html}
+%doc AUTHORS,COPYING,NEWS,README,doc/*.html
 %doc $RPM_SOURCE_DIR/README.RPM
 %dir %{_sysconfdir}/sasl2
 %{_libdir}/libsasl*.so.*
-%if %{includev1}
-%dir %{_plugindir}/
-%endif
 %dir %{_plugindir2}/
-%if %{includev1}
-%{_plugindir}/*anonymous*.so*
-%{_plugindir}/*anonymous*.la
-%endif
 %{_plugindir2}/*anonymous*.so*
 %{_plugindir2}/*sasldb*.so*
 %{_mandir}/man8/*
 %{_sbindir}/dbconverter-2
-%if %{includev1}
-%{_sbindir}/saslpasswd
-%{_sbindir}/sasldblistusers
-%endif
 %{_sbindir}/saslpasswd2
 %{_sbindir}/sasldblistusers2
 %{_sbindir}/pluginviewer
@@ -464,23 +393,11 @@ fi
 
 %files plain
 %defattr(-,root,root)
-%if %{includev1}
-%{_plugindir}/*plain*.so*
-%{_plugindir}/*plain*.la
-%{_plugindir}/*login*.so*
-%{_plugindir}/*login*.la
-%endif
 %{_plugindir2}/*plain*.so*
 %{_plugindir2}/*login*.so*
 
 %files md5
 %defattr(-,root,root)
-%if %{includev1}
-%{_plugindir}/*crammd5*.so*
-%{_plugindir}/*crammd5*.la
-%{_plugindir}/*digestmd5*.so*
-%{_plugindir}/*digestmd5*.la
-%endif
 %{_plugindir2}/*crammd5*.so*
 %{_plugindir2}/*digestmd5*.so*
 
@@ -496,28 +413,23 @@ fi
 %defattr(-,root,root)
 %{_plugindir2}/*ldapdb*.so*
 
+%files scram
+%defattr(-,root,root)
+%{_plugindir2}/libscram.so*
+
+%files gs2
+%defattr(-,root,root)
+%{_plugindir2}/libgs2.so*
+
 %files devel
 %defattr(-,root,root)
-%if %{includev1}
-%doc %{name}-%{version}/%{cs1_version}-devel
-%endif
 %doc %{name}-%{version}/doc/*.txt
 %defattr(-,root,root)
-%if %{includev1}
-%{_bindir}/sasl-sample-client
-%{_bindir}/sasl-sample-server
-%endif
 %{_bindir}/sasl2-sample-client
 %{_bindir}/sasl2-sample-server
 %{_includedir}/*
 %{_libdir}/libsasl*.so
-%if %{includev1}
-%{_plugindir}/*anonymous*.a
-%{_plugindir}/*crammd5*.a
-%{_plugindir}/*digestmd5*.a
-%{_plugindir}/*login*.a
-%{_plugindir}/*plain*.a
-%endif
+%{_libdir}/pkgconfig/*.pc
 %{_mandir}/man3/*
 
 ## to build compat32 for x86_64 architecture support
@@ -555,6 +467,14 @@ fi
 %defattr(-,root,root)
 %{_plugindir2}/*ldapdb*.so*
 
+%files -n compat32-%{name}-scram
+%defattr(-,root,root)
+%{_plugindir2}/libscram.so*
+
+%files -n compat32-%{name}-gs2
+%defattr(-,root,root)
+%{_plugindir2}/libgs2.so*
+
 %files -n compat32-%{name}-devel
 %defattr(-,root,root)
 %{_libdir}/libsasl*.so
@@ -562,6 +482,30 @@ fi
 
 
 %changelog
+* Thu Jan  9 2014 IWAI, Masaharu <iwaim.sub@gmail.com> 2.1.26-1
+- update to 2.1.26
+ - drop sig file (Source1): upstream isn't release.
+- add cyrus-sasl-scram and cyrus-sasl-gs2 packages
+- add pkgconfig file in cyrus-sasl-devel package
+- fix License
+- update URL
+- update %%doc
+- drop SASLv1
+ - drop Source2,3
+ - drop Patch0-5 for SASLv1 patches
+- update patch from RHEL7 beta cyrus-sasl-2.1.26-12.1.el7
+ - no rpath patch (Patch11)
+ - keytab patch (Patch28)
+ - db4 patch (Patch100)
+ - gcc44 patch (Patch101)
+- update CVE-2013-4122 patch (Patch200) from Gentoo Linux
+- update configure patch (Patch102)
+- drop unnecessary patch
+ - automake 1.10 patch (Patch27)
+ - upstream fixed
+  - typo patch (Patch25)
+  - digest commas patch (Patch26)
+
 * Mon Sep 16 2013 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.1.23-11
 - add patch200 for fix CVE-2013-4122 (NULL ptr. dereference)