OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 23-Dec-2008 11:19:02
Branch: HEAD Handle: 2008122310185901
Modified files:
openpkg-src/sasl rc.sasl sasl.patch sasl.spec
Log:
major packaging cleanups and improvements
Summary:
Revision Changes Path
1.25 +8 -4 openpkg-src/sasl/rc.sasl
1.23 +11 -2 openpkg-src/sasl/sasl.patch
1.160 +39 -24 openpkg-src/sasl/sasl.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/rc.sasl
============================================================================
$ cvs diff -u -r1.24 -r1.25 rc.sasl
--- openpkg-src/sasl/rc.sasl 25 Aug 2006 19:19:05 -0000 1.24
+++ openpkg-src/sasl/rc.sasl 23 Dec 2008 10:18:59 -0000 1.25
@@ -5,8 +5,9 @@
%config
sasl_enable="$openpkg_rc_def"
+ sasl_flags=""
sasl_authmech="@l_authmech@"
- sasl_threads="2"
+ sasl_threads="4"
sasl_log_prolog="true"
sasl_log_epilog="true"
sasl_log_numfiles="10"
@@ -14,7 +15,7 @@
sasl_log_complevel="9"
%common
- sasl_pidfile="@l_prefix@/var/sasl/saslauthd/saslauthd.pid"
+ sasl_pidfile="@l_prefix@/var/sasl/run/saslauthd.pid"
sasl_signal () {
[ -f $sasl_pidfile ] && kill -$1 `cat $sasl_pidfile`
}
@@ -31,7 +32,10 @@
%start -p 400 -u @l_susr@
rcService sasl enable yes || exit 0
rcService sasl active yes && exit 0
- @l_prefix@/sbin/saslauthd -a ${sasl_authmech} -n ${sasl_threads}
+ @l_prefix@/sbin/saslauthd \
+ -a "${sasl_authmech}" \
+ -n "${sasl_threads}" \
+ ${sasl_flags}
%stop -p 600 -u @l_susr@
rcService sasl enable yes || exit 0
@@ -49,7 +53,7 @@
rcService sasl enable yes || exit 0
shtool rotate -f \
-n ${sasl_log_numfiles} -s ${sasl_log_minsize} -d \
- -z ${sasl_log_complevel} -o @l_susr@ -g @l_mgrp@ -m 644 \
+ -z ${sasl_log_complevel} -o @l_susr@ -g @l_sgrp@ -m 600 \
-P "${sasl_log_prolog}" \
-E "${sasl_log_epilog}; rc sasl restart" \
@l_prefix@/var/sasl/log/saslauthd.log
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/sasl.patch
============================================================================
$ cvs diff -u -r1.22 -r1.23 sasl.patch
--- openpkg-src/sasl/sasl.patch 12 Apr 2007 14:26:02 -0000 1.22
+++ openpkg-src/sasl/sasl.patch 23 Dec 2008 10:19:00 -0000 1.23
@@ -288,7 +288,7 @@
Index: sample/client.c
--- sample/client.c.orig 2004-03-09 18:35:32 +0100
-+++ sample/client.c 2007-01-08 18:48:48 +0100
++++ sample/client.c 2008-12-23 10:19:47 +0100
@@ -133,13 +133,11 @@
return SASL_OK;
}
@@ -315,7 +315,7 @@
Index: sample/sample-client.c
--- sample/sample-client.c.orig 2004-10-26 13:14:33 +0200
-+++ sample/sample-client.c 2007-01-08 18:48:48 +0100
++++ sample/sample-client.c 2008-12-23 10:40:08 +0100
@@ -244,13 +244,11 @@
return SASL_OK;
}
@@ -340,6 +340,15 @@
if (! password)
return SASL_FAIL;
+@@ -307,7 +305,7 @@
+ fflush(stdout);
+
+ if (id == SASL_CB_ECHOPROMPT) {
+- char *original = getpassphrase("");
++ char *original = my_getpassphrase("");
+ if (! original)
+ return SASL_FAIL;
+ if (*original)
Index: saslauthd/Makefile.in
--- saslauthd/Makefile.in.orig 2006-05-18 21:30:21 +0200
+++ saslauthd/Makefile.in 2007-01-08 18:48:48 +0100
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/sasl.spec
============================================================================
$ cvs diff -u -r1.159 -r1.160 sasl.spec
--- openpkg-src/sasl/sasl.spec 1 Jan 2008 15:04:18 -0000 1.159
+++ openpkg-src/sasl/sasl.spec 23 Dec 2008 10:19:00 -0000 1.160
@@ -32,7 +32,7 @@
Group: Cryptography
License: BSD
Version: 2.1.22
-Release: 20080101
+Release: 20081223
# package options
%option with_fsl yes
@@ -184,16 +184,16 @@
./configure \
--cache-file=./config.cache \
--prefix=%{l_prefix} \
- --sysconfdir="%{l_prefix}/etc/sasl" \
- --with-configdir="%{l_prefix}/etc/sasl/sasl" \
+ --sysconfdir=%{l_prefix}/etc/sasl \
+ --with-configdir=%{l_prefix}/etc/sasl/sasl.d \
--with-plugindir=%{l_prefix}/lib/sasl \
- --with-saslauthd=%{l_prefix}/var/sasl/saslauthd \
+ --with-saslauthd=%{l_prefix}/var/sasl/db/saslauthd \
--enable-digest \
--enable-cram \
--enable-anon \
%if "%{with_sasldb}" == "yes"
--enable-auth-sasldb \
- --with-dbpath=%{l_prefix}/var/sasl/sasldb \
+ --with-dbpath=%{l_prefix}/var/sasl/db/sasl.db \
--with-dblib=berkeley \
--with-bdb-incdir=%{l_prefix}/include \
--with-bdb-libdir=%{l_prefix}/lib \
@@ -256,8 +256,8 @@
--enable-shared \
--enable-static \
--enable-staticdlopen \
+ --enable-sample \
--disable-java \
- --disable-sample \
--disable-krb4 \
--without-des
@@ -293,8 +293,12 @@
# build package
%{l_make} %{l_mflags}
- cd saslauthd
- %{l_make} %{l_mflags} testsaslauthd
+ ( cd saslauthd
+ %{l_make} %{l_mflags} testsaslauthd
+ ) || exit $?
+ ( cd sample
+ %{l_make} %{l_mflags} sample-client sample-server
+ ) || exit $?
%install
rm -rf $RPM_BUILD_ROOT
@@ -313,14 +317,30 @@
# post-adjust installation
mv $RPM_BUILD_ROOT%{l_prefix}/lib/sasl2 \
$RPM_BUILD_ROOT%{l_prefix}/lib/sasl
+ mv $RPM_BUILD_ROOT%{l_prefix}/sbin/testsaslauthd \
+ $RPM_BUILD_ROOT%{l_prefix}/sbin/saslauthd-test
+ mv $RPM_BUILD_ROOT%{l_prefix}/sbin/pluginviewer \
+ $RPM_BUILD_ROOT%{l_prefix}/sbin/sasl-pluginviewer
+ mv $RPM_BUILD_ROOT%{l_prefix}/man/man8/pluginviewer.8 \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man8/sasl-pluginviewer.8
+ mv $RPM_BUILD_ROOT%{l_prefix}/sbin/saslpasswd2 \
+ $RPM_BUILD_ROOT%{l_prefix}/sbin/saslpasswd
+ mv $RPM_BUILD_ROOT%{l_prefix}/man/man8/saslpasswd2.8 \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man8/saslpasswd.8
+ mv $RPM_BUILD_ROOT%{l_prefix}/sbin/sasldblistusers2 \
+ $RPM_BUILD_ROOT%{l_prefix}/sbin/sasldblistusers
+ mv $RPM_BUILD_ROOT%{l_prefix}/man/man8/sasldblistusers2.8 \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man8/sasldblistusers.8
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/sbin/dbconverter-2
strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true
- # install saslauthd test program
- %{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/sbin
+ # install sample client/server programs
+ %{l_shtool} install -c -m 755 \
+ sample/sample-client \
+ $RPM_BUILD_ROOT%{l_prefix}/sbin/sasl-sample-client
%{l_shtool} install -c -m 755 \
- saslauthd/testsaslauthd \
- $RPM_BUILD_ROOT%{l_prefix}/sbin/
+ sample/sample-server \
+ $RPM_BUILD_ROOT%{l_prefix}/sbin/sasl-sample-server
# install saslauthd default configuration
%{l_shtool} mkdir -f -p -m 755 \
@@ -329,19 +349,12 @@
%{SOURCE saslauthd.conf} \
$RPM_BUILD_ROOT%{l_prefix}/etc/sasl/
- # install missing manual pages
- %{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/man/man8
- %{l_shtool} install -c -m 644 \
- utils/saslpasswd2.8 \
- utils/sasldblistusers2.8 \
- $RPM_BUILD_ROOT%{l_prefix}/man/man8/
-
# create necessary additional directories
%{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/var/sasl/run \
$RPM_BUILD_ROOT%{l_prefix}/var/sasl/log \
- $RPM_BUILD_ROOT%{l_prefix}/var/sasl/saslauthd \
- $RPM_BUILD_ROOT%{l_prefix}/etc/sasl
+ $RPM_BUILD_ROOT%{l_prefix}/var/sasl/db/saslauthd \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/sasl/sasl.d
# install run-command script
%if "%{with_pam}" == "yes"
@@ -371,7 +384,9 @@
'%config %{l_prefix}/etc/fsl/fsl.sasl' \
'%config %{l_prefix}/etc/sasl/saslauthd.conf' \
'%dir %attr(0750,%{l_musr},%{l_rgrp}) %{l_prefix}/var/sasl' \
- '%dir %attr(0750,%{l_musr},%{l_rgrp})
%{l_prefix}/var/sasl/saslauthd' \
+ '%dir %attr(0750,%{l_musr},%{l_rgrp}) %{l_prefix}/var/sasl/db' \
+ '%dir %attr(0750,%{l_musr},%{l_rgrp})
%{l_prefix}/var/sasl/db/saslauthd' \
+ '%dir %attr(0750,%{l_musr},%{l_mgrp}) %{l_prefix}/var/sasl/run' \
'%dir %attr(0700,%{l_susr},%{l_sgrp}) %{l_prefix}/var/sasl/log'
%files -f files
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
