auto-import changelog data from cyrus-sasl-2.1.15-6.src.rpm
Thu Oct 23 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.15-6
- use /dev/urandom instead of /dev/random for SASL2 (docs indicate that
this is safe if you aren't using OTP or SRP, and we build neither);
SASL1 appears to use it to seed the libc RNG only (#103378)
Mon Oct 20 2003 Nalin Dahyabhai <nalin@redhat.com>
- obey RPM_OPT_FLAGS again when krb5_prefix != %{_prefix}
Fri Oct 17 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.15-5
- install saslauthd's mdoc page instead of the pre-formatted man page,
which would get formatted again
Mon Sep 15 2003 Nalin Dahyabhai <nalin@redhat.com>
- include testsaslauthd
- note in the README that the saslauthd protocol is different for v1 and
v2, so v1's clients can't talk to the v2 server
Thu Aug 21 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.15-4
- rebuild
Thu Aug 21 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.15-3
- add logic to build with gssapi libs in either /usr or /usr/kerberos
Mon Jul 21 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.15-2
- rebuild
Tue Jul 15 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.15-1
- update to 2.1.15
Mon Jul 14 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.14-1
- update to 2.1.14
Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
- rebuilt
Fri May 09 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.13-3
- change -m argument to saslauthd to be a directory instead of a path
Thu May 08 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.13-2
- link libsasl2 with -lpthread to ensure that the sasldb plug-in can always
be loaded
Tue Apr 29 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.13-1
- update to 2.1.13
This commit is contained in:
cvsdist
parent
4d9d931477
commit
070f98423b
|
|
@ -1,2 +1,2 @@
|
|||
cyrus-sasl-1.5.28.tar.gz
|
||||
cyrus-sasl-2.1.10.tar.gz
|
||||
cyrus-sasl-2.1.15.tar.gz
|
||||
|
|
|
|||
148
cyrus-sasl.spec
148
cyrus-sasl.spec
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
Summary: The Cyrus SASL library.
|
||||
Name: cyrus-sasl
|
||||
Version: 2.1.10
|
||||
Release: 4
|
||||
Version: 2.1.15
|
||||
Release: 6
|
||||
License: Freely Distributable
|
||||
Group: System Environment/Libraries
|
||||
Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-%{version}.tar.gz
|
||||
|
|
@ -16,12 +16,18 @@ Source4: saslauthd.init
|
|||
Source5: README.RPM
|
||||
URL: http://asg.web.cmu.edu/sasl/sasl-library.html
|
||||
Patch0: cyrus-sasl-1.5.24-rpath.patch
|
||||
Patch1: cyrus-sasl-2.1.7-gdbm.patch
|
||||
Patch2: cyrus-sasl-2.1.10-des.patch
|
||||
Patch1: cyrus-sasl-1.5.28-autoconf25.patch
|
||||
Patch2: cyrus-sasl-1.5.28-automake17.patch
|
||||
Patch3: cyrus-sasl-2.1.7-gdbm.patch
|
||||
Patch4: cyrus-sasl-2.1.10-des.patch
|
||||
Patch5: cyrus-sasl-2.1.14-automake17.patch
|
||||
Patch6: cyrus-sasl-2.1.13-rpath.patch
|
||||
Patch7: cyrus-sasl-2.1.15-libtool15.patch
|
||||
Patch8: cyrus-sasl-2.1.14-plugin.patch
|
||||
Buildroot: %{_tmppath}/%{name}-root
|
||||
BuildPrereq: autoconf213, automake15, libtool
|
||||
# Note: berkeley db for sasl2, gdbm for sasl1.
|
||||
BuildPrereq: db4-devel, gdbm-devel, krb5-devel, openssl-devel, pam-devel
|
||||
BuildPrereq: db4-devel, gdbm-devel, krb5-devel >= 1.2, openssl-devel, pam-devel
|
||||
BuildPrereq: pkgconfig
|
||||
Prereq: /sbin/ldconfig, chkconfig, /sbin/service
|
||||
|
||||
|
|
@ -71,28 +77,39 @@ CRAM-MD5 and DIGEST-MD5 authentication schemes.
|
|||
%setup -q -c -a 2
|
||||
pushd cyrus-sasl-%{cs1_version}
|
||||
%patch0 -p1 -b .rpath
|
||||
libtoolize -f
|
||||
aclocal-1.5 -I ./config -I ./cmulocal
|
||||
automake-1.5 -a
|
||||
autoheader-2.13
|
||||
autoconf-2.13
|
||||
%patch1 -p1 -b .autoconf25
|
||||
%patch2 -p1 -b .automake17
|
||||
libtoolize -f -c
|
||||
aclocal -I config -I cmulocal
|
||||
automake -a -c -f
|
||||
autoheader
|
||||
autoconf -f
|
||||
popd
|
||||
|
||||
pushd cyrus-sasl-%{version}
|
||||
%patch1 -p1 -b .gdbm
|
||||
%patch2 -p1 -b .des
|
||||
libtoolize -f
|
||||
aclocal-1.5 -I ./config -I ./cmulocal
|
||||
automake-1.5 -a --include-deps
|
||||
autoheader-2.13
|
||||
autoconf-2.13
|
||||
%patch3 -p1 -b .gdbm
|
||||
%patch4 -p1 -b .des
|
||||
%patch5 -p1 -b .automake17
|
||||
%patch6 -p1 -b .rpath
|
||||
%patch7 -p1 -b .libtool15
|
||||
%patch8 -p1 -b .plugin
|
||||
ln -s ../plugins/plugin_common.c lib/
|
||||
# Remove the mismatching AC_PROG_LIBTOOL definition and its ltconfig.
|
||||
> acinclude.m4
|
||||
rm config/ltconfig
|
||||
libtoolize -f -c
|
||||
aclocal -I config -I cmulocal
|
||||
automake -a -c -f
|
||||
autoheader
|
||||
autoconf -f
|
||||
|
||||
pushd saslauthd
|
||||
libtoolize -f
|
||||
aclocal-1.5 -I ../config -I ../cmulocal
|
||||
automake-1.5 -a --include-deps
|
||||
autoheader-2.13
|
||||
autoconf-2.13
|
||||
rm config/ltconfig
|
||||
libtoolize -f -c
|
||||
aclocal -I config -I ../cmulocal -I ../config
|
||||
automake -a -c -f
|
||||
autoheader
|
||||
autoconf -f
|
||||
popd
|
||||
popd
|
||||
|
||||
|
|
@ -111,16 +128,21 @@ done
|
|||
popd
|
||||
|
||||
%build
|
||||
CPPFLAGS="-I%{_prefix}/kerberos/include $CPPFLAGS"; export CPPFLAGS
|
||||
CFLAGS="$RPM_OPT_FLAGS $CPPFLAGS"; export CFLAGS
|
||||
LDFLAGS="-L%{_prefix}/kerberos/%{_lib} $LDFLAGS"; export LDFLAGS
|
||||
krb5_prefix=`krb5-config --prefix`
|
||||
if test x$krb5_prefix = x%{_prefix} ; then
|
||||
krb5_prefix=
|
||||
else
|
||||
CPPFLAGS="-I${krb5_prefix}/include"; export CPPFLAGS
|
||||
CFLAGS="-I${krb5_prefix}/include $RPM_OPT_FLAGS"; export CFLAGS
|
||||
LDFLAGS="-L${krb5_prefix}/%{_lib}"; export LDFLAGS
|
||||
fi
|
||||
|
||||
pushd cyrus-sasl-%{cs1_version}
|
||||
%configure \
|
||||
--enable-static --with-pic --enable-shared \
|
||||
--enable-static --enable-staticdlopen --with-pic --enable-shared \
|
||||
--with-plugindir=%{_plugindir} \
|
||||
--disable-krb4 \
|
||||
--enable-gssapi=/usr/kerberos \
|
||||
--enable-gssapi${krb5_prefix:+=${krb5_prefix}} \
|
||||
--with-rc4 \
|
||||
--with-dblib=gdbm \
|
||||
--enable-anon \
|
||||
|
|
@ -132,27 +154,28 @@ make sasldir=%{_plugindir}
|
|||
popd
|
||||
|
||||
pushd cyrus-sasl-%{version}
|
||||
LIBS=-lcrypt; export LIBS
|
||||
LIBS="-lcrypt"; export LIBS
|
||||
%configure \
|
||||
--enable-static --with-pic --enable-shared --disable-java \
|
||||
--with-plugindir=%{_plugindir2} \
|
||||
--disable-krb4 \
|
||||
--enable-gssapi=/usr/kerberos \
|
||||
--enable-gssapi${krb5_prefix:+=${krb5_prefix}} \
|
||||
--with-rc4 \
|
||||
--with-dblib=berkeley \
|
||||
--with-saslauthd=/var/run/saslauthd --without-pwcheck \
|
||||
--with-devrandom=/dev/urandom \
|
||||
--enable-anon \
|
||||
--enable-cram \
|
||||
--enable-digest \
|
||||
--enable-plain \
|
||||
--enable-login
|
||||
# --enable-auth-sasldb -- EXPERIMENTAL
|
||||
make -C sasldb allockey.o allockey.lo db_berkeley.o db_berkeley.lo sasldir=%{_plugindir2}
|
||||
make JAV= sasldir=%{_plugindir2}
|
||||
make sasldir=%{_plugindir2}
|
||||
make -C saslauthd testsaslauthd
|
||||
popd
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
test "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT
|
||||
pushd cyrus-sasl-%{cs1_version}
|
||||
%makeinstall sasldir=$RPM_BUILD_ROOT/%{_plugindir}
|
||||
install -m755 -d $RPM_BUILD_ROOT%{_bindir}
|
||||
|
|
@ -163,7 +186,7 @@ install -m755 sample/server $RPM_BUILD_ROOT%{_bindir}/sasl-sample-server
|
|||
popd
|
||||
|
||||
pushd cyrus-sasl-%{version}
|
||||
%makeinstall JAV= sasldir=$RPM_BUILD_ROOT/%{_plugindir2}
|
||||
%makeinstall sasldir=$RPM_BUILD_ROOT/%{_plugindir2}
|
||||
install -m755 -d $RPM_BUILD_ROOT%{_bindir}
|
||||
|
||||
libtool --mode=install \
|
||||
|
|
@ -171,12 +194,14 @@ install -m755 sample/client $RPM_BUILD_ROOT%{_bindir}/sasl2-sample-client
|
|||
libtool --mode=install \
|
||||
install -m755 sample/server $RPM_BUILD_ROOT%{_bindir}/sasl2-sample-server
|
||||
libtool --mode=install \
|
||||
install -m755 saslauthd/testsaslauthd $RPM_BUILD_ROOT%{_sbindir}/testsaslauthd
|
||||
libtool --mode=install \
|
||||
install -m755 utils/dbconverter-2 $RPM_BUILD_ROOT%{_sbindir}/dbconverter-2
|
||||
|
||||
# Install the saslauthd man page in the expected location, even if it's
|
||||
# pre-formatted.
|
||||
# Install the saslauthd mdoc page in the expected location. Sure, it's not
|
||||
# really a man page, but groff seems to be able to cope with it.
|
||||
install -m755 -d $RPM_BUILD_ROOT%{_mandir}/man8/
|
||||
install -m644 saslauthd/*.8 $RPM_BUILD_ROOT%{_mandir}/man8/
|
||||
install -m644 saslauthd/saslauthd.mdoc $RPM_BUILD_ROOT%{_mandir}/man8/saslauthd.8
|
||||
|
||||
# Create the saslauthd listening directory.
|
||||
install -m755 -d $RPM_BUILD_ROOT/var/run/saslauthd
|
||||
|
|
@ -189,7 +214,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/sasl2/libotp.*
|
|||
rm -f $RPM_BUILD_ROOT%{_mandir}/cat8/saslauthd.8
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
test "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
|
|
@ -227,6 +252,7 @@ fi
|
|||
%{_sbindir}/saslpasswd2
|
||||
%{_sbindir}/sasldblistusers2
|
||||
%{_sbindir}/saslauthd
|
||||
%{_sbindir}/testsaslauthd
|
||||
%config /etc/rc.d/init.d/saslauthd
|
||||
/var/run/saslauthd
|
||||
|
||||
|
|
@ -285,7 +311,55 @@ fi
|
|||
%{_plugindir2}/*sasldb*.a
|
||||
%{_mandir}/man3/*
|
||||
|
||||
#
|
||||
# TODO: enable ntlm
|
||||
#
|
||||
%changelog
|
||||
* Thu Oct 23 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.15-6
|
||||
- use /dev/urandom instead of /dev/random for SASL2 (docs indicate that this is
|
||||
safe if you aren't using OTP or SRP, and we build neither); SASL1 appears to
|
||||
use it to seed the libc RNG only (#103378)
|
||||
|
||||
* Mon Oct 20 2003 Nalin Dahyabhai <nalin@redhat.com>
|
||||
- obey RPM_OPT_FLAGS again when krb5_prefix != %%{_prefix}
|
||||
|
||||
* Fri Oct 17 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.15-5
|
||||
- install saslauthd's mdoc page instead of the pre-formatted man page, which
|
||||
would get formatted again
|
||||
|
||||
* Mon Sep 15 2003 Nalin Dahyabhai <nalin@redhat.com>
|
||||
- include testsaslauthd
|
||||
- note in the README that the saslauthd protocol is different for v1 and v2,
|
||||
so v1's clients can't talk to the v2 server
|
||||
|
||||
* Thu Aug 21 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.15-4
|
||||
- rebuild
|
||||
|
||||
* Thu Aug 21 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.15-3
|
||||
- add logic to build with gssapi libs in either /usr or /usr/kerberos
|
||||
|
||||
* Mon Jul 21 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.15-2
|
||||
- rebuild
|
||||
|
||||
* Tue Jul 15 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.15-1
|
||||
- update to 2.1.15
|
||||
|
||||
* Mon Jul 14 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.14-1
|
||||
- update to 2.1.14
|
||||
|
||||
* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
|
||||
- rebuilt
|
||||
|
||||
* Fri May 9 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.13-3
|
||||
- change -m argument to saslauthd to be a directory instead of a path
|
||||
|
||||
* Thu May 8 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.13-2
|
||||
- link libsasl2 with -lpthread to ensure that the sasldb plug-in can always
|
||||
be loaded
|
||||
|
||||
* Tue Apr 29 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.13-1
|
||||
- update to 2.1.13
|
||||
|
||||
* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
|
||||
- rebuilt
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
. /etc/init.d/functions
|
||||
|
||||
# Source our configuration file for these variables.
|
||||
SOCKET=/var/run/saslauthd/mux
|
||||
SOCKETDIR=/var/run/saslauthd
|
||||
MECH=shadow
|
||||
FLAGS=
|
||||
if [ -f /etc/sysconfig/saslauthd ] ; then
|
||||
|
|
@ -27,7 +27,7 @@ path=/usr/sbin/saslauthd
|
|||
|
||||
start() {
|
||||
echo -n $"Starting $prog: "
|
||||
daemon $path -m $SOCKET -a $MECH $FLAGS
|
||||
daemon $path -m $SOCKETDIR -a $MECH $FLAGS
|
||||
RETVAL=$?
|
||||
echo
|
||||
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
|
||||
|
|
|
|||
Loading…
Reference in New Issue