[CVS] OpenPKG: openpkg-src/sasl/ rc.sasl sasl.spec openpkg-web/ news.t...
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 22-Nov-2003 00:51:09
Branch: HEAD Handle: 2003112123510702
Modified files:
openpkg-src/saslrc.sasl sasl.spec
openpkg-web news.txt
Log:
adjust rc priority (although limited general usefulness)
Summary:
RevisionChanges Path
1.20+2 -2 openpkg-src/sasl/rc.sasl
1.103 +1 -1 openpkg-src/sasl/sasl.spec
1.7501 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/rc.sasl
$ cvs diff -u -r1.19 -r1.20 rc.sasl
--- openpkg-src/sasl/rc.sasl 9 Sep 2003 17:05:34 - 1.19
+++ openpkg-src/sasl/rc.sasl 21 Nov 2003 23:51:09 - 1.20
@@ -28,12 +28,12 @@
echo "sasl_usable=\"$sasl_usable\""
echo "sasl_active=\"$sasl_active\""
-%start -u @l_susr@
+%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}
-%stop -u @l_susr@
+%stop -p 400 -u @l_susr@
rcService sasl enable yes || exit 0
rcService sasl active no && exit 0
sasl_signal TERM
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/sasl.spec
$ cvs diff -u -r1.102 -r1.103 sasl.spec
--- openpkg-src/sasl/sasl.spec10 Nov 2003 18:15:53 - 1.102
+++ openpkg-src/sasl/sasl.spec21 Nov 2003 23:51:09 - 1.103
@@ -33,7 +33,7 @@
Group:Cryptography
License: BSD
Version: 2.1.15
-Release: 20031110
+Release: 20031122
# package options
%option with_fslyes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.7500 -r1.7501 news.txt
--- openpkg-web/news.txt 21 Nov 2003 23:50:36 - 1.7500
+++ openpkg-web/news.txt 21 Nov 2003 23:51:07 - 1.7501
@@ -1,3 +1,4 @@
+22-Nov-2003: Upgraded package: P
22-Nov-2003: Upgraded package: P
21-Nov-2003: Upgraded package: P
21-Nov-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/sasl/ rc.sasl sasl.spec openpkg-web/ news.t...
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 09-Sep-2003 19:05:35
Branch: HEAD Handle: 2003090918053301
Modified files:
openpkg-src/saslrc.sasl sasl.spec
openpkg-web news.txt
Log:
Implement features in #202
Summary:
RevisionChanges Path
1.19+9 -4 openpkg-src/sasl/rc.sasl
1.98+1 -1 openpkg-src/sasl/sasl.spec
1.6481 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/rc.sasl
$ cvs diff -u -r1.18 -r1.19 rc.sasl
--- openpkg-src/sasl/rc.sasl 22 Jul 2003 11:24:09 - 1.18
+++ openpkg-src/sasl/rc.sasl 9 Sep 2003 17:05:34 - 1.19
@@ -30,24 +30,29 @@
%start -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}
%stop -u @l_susr@
rcService sasl enable yes || exit 0
+rcService sasl active no && exit 0
sasl_signal TERM
%restart -u @l_susr@
rcService sasl enable yes || exit 0
-sasl_signal TERM
+rcService sasl active no && exit 0
+rc sasl stop
sleep 2
-@l_prefix@/sbin/saslauthd -a ${sasl_authmech} -n ${sasl_threads}
+rc sasl start
%daily -u @l_susr@
rcService sasl enable yes || exit 0
+
+# rotate logfile
shtool rotate -f \
-n ${sasl_log_numfiles} -s ${sasl_log_minsize} -d \
--z ${sasl_log_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
+-z ${sasl_log_complevel} -o @l_susr@ -g @l_mgrp@ -m 644 \
-P "${sasl_log_prolog}" \
--E "${sasl_log_epilog}" \
+-E "${sasl_log_epilog} && rc sasl restart" \
@l_prefix@/var/sasl/log/saslauthd.log
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/sasl.spec
$ cvs diff -u -r1.97 -r1.98 sasl.spec
--- openpkg-src/sasl/sasl.spec22 Jul 2003 08:11:10 - 1.97
+++ openpkg-src/sasl/sasl.spec9 Sep 2003 17:05:34 - 1.98
@@ -33,7 +33,7 @@
Group:Cryptography
License: BSD
Version: 2.1.15
-Release: 20030722
+Release: 20030909
# package options
%option with_fslyes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.6480 -r1.6481 news.txt
--- openpkg-web/news.txt 9 Sep 2003 16:50:16 - 1.6480
+++ openpkg-web/news.txt 9 Sep 2003 17:05:33 - 1.6481
@@ -1,3 +1,4 @@
+09-Sep-2003: Upgraded package: P
09-Sep-2003: Upgraded package: P
09-Sep-2003: Upgraded package: P
09-Sep-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/sasl/ rc.sasl sasl.spec openpkg-web/ news.t...
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 28-Jun-2003 17:00:28
Branch: HEAD Handle: 2003062816002601
Modified files:
openpkg-src/saslrc.sasl sasl.spec
openpkg-web news.txt
Log:
require susr; remove commenting
Summary:
RevisionChanges Path
1.11+1 -3 openpkg-src/sasl/rc.sasl
1.81+1 -1 openpkg-src/sasl/sasl.spec
1.5059 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/rc.sasl
$ cvs diff -u -r1.10 -r1.11 rc.sasl
--- openpkg-src/sasl/rc.sasl 24 Jun 2003 16:23:05 - 1.10
+++ openpkg-src/sasl/rc.sasl 28 Jun 2003 15:00:27 - 1.11
@@ -31,10 +31,8 @@
sleep 2
@l_prefix@/sbin/saslauthd -a ${sasl_authmech} -n ${sasl_threads}
-%daily -u @l_rusr@
+%daily -u @l_susr@
opServiceEnabled sasl || exit 0
-
-# rotate logfile
shtool rotate -f \
-n${sasl_log_numfiles} -s${sasl_log_minsize} -d \
-z${sasl_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/sasl.spec
$ cvs diff -u -r1.80 -r1.81 sasl.spec
--- openpkg-src/sasl/sasl.spec24 Jun 2003 16:23:05 - 1.80
+++ openpkg-src/sasl/sasl.spec28 Jun 2003 15:00:27 - 1.81
@@ -33,7 +33,7 @@
Group:Cryptography
License: BSD
Version: 2.1.13
-Release: 20030624
+Release: 20030628
# package options
%option with_fslyes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.5058 -r1.5059 news.txt
--- openpkg-web/news.txt 28 Jun 2003 14:59:26 - 1.5058
+++ openpkg-web/news.txt 28 Jun 2003 15:00:26 - 1.5059
@@ -1,3 +1,4 @@
+28-Jun-2003: Upgraded package: P
28-Jun-2003: Upgraded package: P
28-Jun-2003: Upgraded package: P
28-Jun-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/sasl/ rc.sasl sasl.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 24-Jun-2003 18:23:06
Branch: HEAD Handle: 2003062417230500
Modified files:
openpkg-src/saslrc.sasl sasl.spec
Log:
Synchronize spec file substitution with recent rc file changes
Summary:
RevisionChanges Path
1.10+1 -1 openpkg-src/sasl/rc.sasl
1.80+2 -0 openpkg-src/sasl/sasl.spec
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/rc.sasl
$ cvs diff -u -r1.9 -r1.10 rc.sasl
--- openpkg-src/sasl/rc.sasl 24 Jun 2003 13:28:35 - 1.9
+++ openpkg-src/sasl/rc.sasl 24 Jun 2003 16:23:05 - 1.10
@@ -31,7 +31,7 @@
sleep 2
@l_prefix@/sbin/saslauthd -a ${sasl_authmech} -n ${sasl_threads}
-%daily -u @l_susr@
+%daily -u @l_rusr@
opServiceEnabled sasl || exit 0
# rotate logfile
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/sasl.spec
$ cvs diff -u -r1.79 -r1.80 sasl.spec
--- openpkg-src/sasl/sasl.spec24 Jun 2003 13:28:35 - 1.79
+++ openpkg-src/sasl/sasl.spec24 Jun 2003 16:23:05 - 1.80
@@ -249,6 +249,8 @@
-e "s;@l_authmech@;${l_authmech};g" \
-e 's;@l_prefix@;%{l_prefix};g' \
-e 's;@l_susr@;%{l_susr};g' \
+-e 's;@l_rusr@;%{l_rusr};g' \
+-e 's;@l_rgrp@;%{l_rgrp};g' \
%{SOURCE rc.sasl} \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/sasl/ rc.sasl sasl.spec openpkg-web/ news.t...
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 24-Jun-2003 15:28:36
Branch: HEAD Handle: 2003062414283401
Modified files:
openpkg-src/saslrc.sasl sasl.spec
openpkg-web news.txt
Log:
add/unify log file trimming
Summary:
RevisionChanges Path
1.9 +15 -0 openpkg-src/sasl/rc.sasl
1.79+1 -1 openpkg-src/sasl/sasl.spec
1.4996 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/rc.sasl
$ cvs diff -u -r1.8 -r1.9 rc.sasl
--- openpkg-src/sasl/rc.sasl 24 Jun 2003 12:08:07 - 1.8
+++ openpkg-src/sasl/rc.sasl 24 Jun 2003 13:28:35 - 1.9
@@ -7,6 +7,11 @@
sasl_enable="yes"
sasl_authmech="@l_authmech@"
sasl_threads="2"
+sasl_log_prolog="true"
+sasl_log_epilog="true"
+sasl_log_numfiles="10"
+sasl_log_minsize="1M"
+sasl_log_complevel="9"
%start -p 200 -u @l_susr@
opServiceEnabled sasl || exit 0
@@ -26,3 +31,13 @@
sleep 2
@l_prefix@/sbin/saslauthd -a ${sasl_authmech} -n ${sasl_threads}
+%daily -u @l_susr@
+opServiceEnabled sasl || exit 0
+
+# rotate logfile
+shtool rotate -f \
+-n${sasl_log_numfiles} -s${sasl_log_minsize} -d \
+-z${sasl_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
+-P "${sasl_log_prolog}" \
+-E "${sasl_log_epilog}" \
+@l_prefix@/var/sasl/log/saslauthd.log
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/sasl.spec
$ cvs diff -u -r1.78 -r1.79 sasl.spec
--- openpkg-src/sasl/sasl.spec23 Jun 2003 21:01:29 - 1.78
+++ openpkg-src/sasl/sasl.spec24 Jun 2003 13:28:35 - 1.79
@@ -33,7 +33,7 @@
Group:Cryptography
License: BSD
Version: 2.1.13
-Release: 20030623
+Release: 20030624
# package options
%option with_fslyes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.4995 -r1.4996 news.txt
--- openpkg-web/news.txt 24 Jun 2003 13:28:25 - 1.4995
+++ openpkg-web/news.txt 24 Jun 2003 13:28:34 - 1.4996
@@ -1,3 +1,4 @@
+24-Jun-2003: Upgraded package: P
24-Jun-2003: Upgraded package: P
24-Jun-2003: Upgraded package: P
24-Jun-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
Re: [CVS] OpenPKG: openpkg-src/sasl/ rc.sasl sasl.spec saslauthd.conf
On Wed, Mar 12, 2003, Michael van Elst wrote: > [...] > polishing, correct sysconfdir > [...] >sasl_enable="yes" > -sasl_authmech="@l_authmech@" > +sasl_authmech="@authmech@" > +#sasl_authmech="sasldb" > +#sasl_authmech="rimap -O remote.imap.server" > +#sasl_authmech="pam" > +#sasl_authmech="ldap" >sasl_threads="2" I intentionally removed these examples, because they are explained in the saslauthd(8) manpage and I want to keep the %config section clean from such things. Additionally you reintroduced @authmech@ while the .spec already uses @[EMAIL PROTECTED] Ralf S. Engelschall [EMAIL PROTECTED] www.engelschall.com __ The OpenPKG Projectwww.openpkg.org Developer Communication List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/sasl/ rc.sasl sasl.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 12-Mar-2003 16:34:18
Branch: HEAD Handle: 2003031215341500
Modified files:
openpkg-src/saslrc.sasl sasl.spec
Log:
fix rc script again; simplify auth method determination
Summary:
RevisionChanges Path
1.6 +1 -5 openpkg-src/sasl/rc.sasl
1.63+1 -5 openpkg-src/sasl/sasl.spec
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/rc.sasl
$ cvs diff -u -r1.5 -r1.6 rc.sasl
--- openpkg-src/sasl/rc.sasl 12 Mar 2003 15:08:22 - 1.5
+++ openpkg-src/sasl/rc.sasl 12 Mar 2003 15:34:15 - 1.6
@@ -5,11 +5,7 @@
%config
sasl_enable="yes"
-sasl_authmech="@authmech@"
-#sasl_authmech="sasldb"
-#sasl_authmech="rimap -O remote.imap.server"
-#sasl_authmech="pam"
-#sasl_authmech="ldap"
+sasl_authmech="@l_authmech@"
sasl_threads="2"
%start -p 200 -u @l_susr@
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/sasl.spec
$ cvs diff -u -r1.62 -r1.63 sasl.spec
--- openpkg-src/sasl/sasl.spec12 Mar 2003 15:08:22 - 1.62
+++ openpkg-src/sasl/sasl.spec12 Mar 2003 15:34:15 - 1.63
@@ -237,11 +237,7 @@
%if "%{with_pam}" == "yes"
l_authmech="pam"
%else
-case "%{l_target}" in
-ix86-linux* ) l_authmech="shadow" ;;
-*-solaris* ) l_authmech="shadow" ;;
-* ) l_authmech="getpwent" ;;
-esac
+l_authmech="getpwent"
%endif
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/sasl/ rc.sasl sasl.spec saslauthd.conf
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 12-Mar-2003 16:08:23
Branch: HEAD Handle: 2003031215082200
Modified files:
openpkg-src/saslrc.sasl sasl.spec saslauthd.conf
Log:
polishing, correct sysconfdir
Summary:
RevisionChanges Path
1.5 +5 -1 openpkg-src/sasl/rc.sasl
1.62+1 -0 openpkg-src/sasl/sasl.spec
1.3 +1 -1 openpkg-src/sasl/saslauthd.conf
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/rc.sasl
$ cvs diff -u -r1.4 -r1.5 rc.sasl
--- openpkg-src/sasl/rc.sasl 12 Mar 2003 14:53:50 - 1.4
+++ openpkg-src/sasl/rc.sasl 12 Mar 2003 15:08:22 - 1.5
@@ -5,7 +5,11 @@
%config
sasl_enable="yes"
-sasl_authmech="@l_authmech@"
+sasl_authmech="@authmech@"
+#sasl_authmech="sasldb"
+#sasl_authmech="rimap -O remote.imap.server"
+#sasl_authmech="pam"
+#sasl_authmech="ldap"
sasl_threads="2"
%start -p 200 -u @l_susr@
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/sasl.spec
$ cvs diff -u -r1.61 -r1.62 sasl.spec
--- openpkg-src/sasl/sasl.spec12 Mar 2003 14:53:50 - 1.61
+++ openpkg-src/sasl/sasl.spec12 Mar 2003 15:08:22 - 1.62
@@ -124,6 +124,7 @@
LIBS="$libs" \
./configure \
--prefix=%{l_prefix} \
+--sysconfdir="%{l_prefix}/etc/sasl" \
--with-plugindir=%{l_prefix}/lib/sasl \
--with-saslauthd=%{l_prefix}/var/sasl/saslauthd \
--with-dbpath=%{l_prefix}/var/sasl/sasldb \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/saslauthd.conf
$ cvs diff -u -r1.2 -r1.3 saslauthd.conf
--- openpkg-src/sasl/saslauthd.conf 12 Mar 2003 14:53:50 - 1.2
+++ openpkg-src/sasl/saslauthd.conf 12 Mar 2003 15:08:22 - 1.3
@@ -28,7 +28,7 @@
#ldap_scope: sub
# starting point for a search
-#ldap_search_base:
+ldap_search_base: MUST-SPECIFY
# authenticate against LDAP (bind|custom|fastbind)
ldap_auth_method: bind
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/sasl/ rc.sasl sasl.spec saslauthd.conf
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 12-Mar-2003 12:26:46
Branch: HEAD Handle: 2003031211264500
Added files:
openpkg-src/saslsaslauthd.conf
Modified files:
openpkg-src/saslrc.sasl sasl.spec
Log:
more LDAP support
Summary:
RevisionChanges Path
1.3 +5 -1 openpkg-src/sasl/rc.sasl
1.60+9 -3 openpkg-src/sasl/sasl.spec
1.1 +54 -0 openpkg-src/sasl/saslauthd.conf
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/rc.sasl
$ cvs diff -u -r1.2 -r1.3 rc.sasl
--- openpkg-src/sasl/rc.sasl 13 Feb 2003 14:32:38 - 1.2
+++ openpkg-src/sasl/rc.sasl 12 Mar 2003 11:26:45 - 1.3
@@ -6,7 +6,11 @@
%config
sasl_enable="yes"
sasl_authmech="@authmech@"
-sasl_threads="5"
+#sasl_authmech="sasldb"
+#sasl_authmech="rimap -O remote.imap.server"
+#sasl_authmech="pam"
+#sasl_authmech="ldap"
+sasl_threads="2"
%start -p 200 -u @l_susr@
opServiceEnabled sasl || exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/sasl.spec
$ cvs diff -u -r1.59 -r1.60 sasl.spec
--- openpkg-src/sasl/sasl.spec12 Mar 2003 10:45:26 - 1.59
+++ openpkg-src/sasl/sasl.spec12 Mar 2003 11:26:45 - 1.60
@@ -46,6 +46,7 @@
Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-%{version}.tar.gz
Source1: rc.sasl
Source2: fsl.sasl
+Source3: saslauthd.conf
Patch0: sasl.patch
# build information
@@ -194,17 +195,21 @@
$RPM_BUILD_ROOT%{l_prefix}/lib/sasl2/*.a
%{l_shtool} mkdir -f -p -m 755 \
-$RPM_BUILD_ROOT%{l_prefix}/man/man8
+$RPM_BUILD_ROOT%{l_prefix}/man/man8 \
+$RPM_BUILD_ROOT%{l_prefix}/sbin \
+$RPM_BUILD_ROOT%{l_prefix}/etc/sasl \
+$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
%{l_shtool} install -c -m 644 \
utils/saslpasswd2.8 \
utils/sasldblistusers2.8 \
$RPM_BUILD_ROOT%{l_prefix}/man/man8/
-%{l_shtool} mkdir -f -p -m 755 \
-$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
%{l_shtool} install -c -m 755 \
saslauthd/testsaslauthd \
$RPM_BUILD_ROOT%{l_prefix}/sbin/
%{l_shtool} install -c -m 755 \
+%{SOURCE saslauthd.conf} \
+$RPM_BUILD_ROOT%{l_prefix}/etc/sasl/
+%{l_shtool} install -c -m 755 \
-e 's;@l_prefix@;%{l_prefix};g' \
-e 's;@l_susr@;%{l_susr};g' \
%{SOURCE rc.sasl} \
@@ -247,6 +252,7 @@
'%config %{l_prefix}/etc/fsl/fsl.sasl' \
'%not %dir %{l_prefix}/etc/fsl' \
%endif
+'%config %{l_prefix}/etc/sasl/saslauthd.conf' \
'%dir %attr(0750,%{l_musr},%{l_rgrp}) %{l_prefix}/var/sasl' \
'%dir %attr(-,%{l_susr},%{l_sgrp}) %{l_prefix}/var/sasl/log'
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/saslauthd.conf
$ cvs diff -u -r0 -r1.1 saslauthd.conf
--- /dev/null 2003-03-12 12:26:45.0 +0100
+++ saslauthd.conf2003-03-12 12:26:45.0 +0100
@@ -0,0 +1,54 @@
+# white space separated list of LDAP servers
+ldap_servers: ldap://127.0.0.1
+
+# authentication for restricted LDAP servers
+#ldap_bind_dn: cn=operator,ou=Profile,o=foo.com
+#ldap_bind_pw: secret
+
+# LDAP version to use (2|3)
+#ldap_version 3
+
+# LDAP timeout
+#ldap_timeout 5
+
+# LDAP aliases (search|find|always|never)
+ldap_deref: never
+
+# follow LDAP referrals ?
+ldap_referrals: no
+
+# restart LDAP I/O operations that fail ?
+ldap_restart: yes
+
+## deprecated client side caching, ignored
+##ldap_cache_ttl
+##ldap_cache_mem
+
+# search scope (sub|one|base)
+#ldap_scope: sub
+
+# starting point for a search
+#ldap_search_base:
+
+# authenticate against LDAP (bind|custom|fastbind)
+ldap_auth_method: bind
+
+# Filter LDAP records, %u = username, %r = realm
+# if ldap_auth_method is 'bind' the filter searches for the DN
+# otherwise the filter searches for the userPassword attribute
+#ldap_filter: uid=%u
+
+# debugging LDAP operation
+#ldap_debug 0
+
+# require and verify server certificate
+#ldap_tls_check_peer: no
+#ldap_tls_cacert_file:
+#ldap_tls_cacert_dir:
+
+# list of SSL/TLS ciphers to allow
+#ldap_tls_ciphers: D
[CVS] OpenPKG: openpkg-src/sasl/ rc.sasl sasl.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 13-Feb-2003 15:32:39
Branch: HEAD Handle: 2003021314323800
Modified files:
openpkg-src/saslrc.sasl sasl.spec
Log:
Modernize rc file to current standards and choose correct auth method
for platform
Summary:
RevisionChanges Path
1.2 +14 -8 openpkg-src/sasl/rc.sasl
1.51+19 -4 openpkg-src/sasl/sasl.spec
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/rc.sasl
$ cvs diff -u -r1.1 -r1.2 rc.sasl
--- openpkg-src/sasl/rc.sasl 12 Aug 2002 08:04:38 - 1.1
+++ openpkg-src/sasl/rc.sasl 13 Feb 2003 14:32:38 - 1.2
@@ -8,15 +8,21 @@
sasl_authmech="@authmech@"
sasl_threads="5"
-%start -p 200 -u root
-if opServiceEnabled sasl; then
-@l_prefix@/sbin/saslauthd -a ${sasl_authmech} -n ${sasl_threads}
+%start -p 200 -u @l_susr@
+opServiceEnabled sasl || exit 0
+@l_prefix@/sbin/saslauthd -a ${sasl_authmech} -n ${sasl_threads}
+
+%stop -p 200 -u @l_susr@
+opServiceEnabled sasl || exit 0
+if [ -f @l_prefix@/var/sasl/saslauthd/mux.pid ]; then
+kill -TERM `cat @l_prefix@/var/sasl/saslauthd/mux.pid`
fi
-%stop -p 200 -u root
-if opServiceEnabled sasl; then
-if [ -f @l_prefix@/var/sasl/saslauthd/mux.pid ]; then
-kill -TERM `cat @l_prefix@/var/sasl/saslauthd/mux.pid`
-fi
+%restart -p 200 -u @l_susr@
+opServiceEnabled sasl || exit 0
+if [ -f @l_prefix@/var/sasl/saslauthd/mux.pid ]; then
+kill -TERM `cat @l_prefix@/var/sasl/saslauthd/mux.pid`
fi
+sleep 2
+@l_prefix@/sbin/saslauthd -a ${sasl_authmech} -n ${sasl_threads}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/sasl.spec
$ cvs diff -u -r1.50 -r1.51 sasl.spec
--- openpkg-src/sasl/sasl.spec13 Feb 2003 12:45:41 - 1.50
+++ openpkg-src/sasl/sasl.spec13 Feb 2003 14:32:38 - 1.51
@@ -126,13 +126,28 @@
$RPM_BUILD_ROOT%{l_prefix}/sbin/
%{l_shtool} install -c -m 755 \
-e 's;@l_prefix@;%{l_prefix};g' \
+-e 's;@l_susr@;%{l_susr};g' \
+%{SOURCE rc.sasl} \
+$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
%if "%{with_pam}" == "yes"
--e 's;@authmech@;pam;g' \
+%{l_shtool} subst -e 's;@authmech@;pam;g' \
+$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/rc.sasl
%else
--e 's;@authmech@;getpwent;g' \
+case "%{l_target}" in
+ix86-linux* )
+%{l_shtool} subst -e 's;@authmech@;shadow;g' \
+$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/rc.sasl
+;;
+*-solaris* )
+%{l_shtool} subst -e 's;@authmech@;shadow;g' \
+$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/rc.sasl
+;;
+* )
+%{l_shtool} subst -e 's;@authmech@;getpwent;g' \
+$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/rc.sasl
+;;
+esac
%endif
-%{SOURCE rc.sasl} \
-$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
%if "%{with_fsl}" == "yes"
%{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
%{l_shtool} install -c -m 644 \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/sasl rc.sasl sasl.spec
OpenPKG CVS Repository
http://www.openpkg.org/cvsweb/cvsweb.cgi
Server: cvs.openpkg.org Name: Christoph Schug
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 12-Aug-2002 10:04:38
Branch: HEAD Handle: 2002081209043800
Added files:
openpkg-src/saslrc.sasl
Modified files:
openpkg-src/saslsasl.spec
Log:
added rc.sasl script to run saslauthd and fixed another bdb issue
Summary:
RevisionChanges Path
1.1 +22 -0 openpkg-src/sasl/rc.sasl
1.27+17 -2 openpkg-src/sasl/sasl.spec
Index: openpkg-src/sasl/rc.sasl
$ cvs update -p -r1.1 rc.sasl
#!@l_prefix@/lib/openpkg/bash @l_prefix@/etc/rc
##
## rc.sasl -- Run-Commands for Cyrus SASL
##
%config
sasl_enable="yes"
sasl_authmech="@authmech@"
sasl_threads="5"
%start -p 200 -u root
if opServiceEnabled sasl; then
@l_prefix@/sbin/saslauthd -a ${sasl_authmech} -n ${sasl_threads}
fi
%stop -p 200 -u root
if opServiceEnabled sasl; then
if [ -f @l_prefix@/var/sasl/saslauthd/mux.pid ]; then
kill -TERM `cat @l_prefix@/var/sasl/saslauthd/mux.pid`
fi
fi
Index: openpkg-src/sasl/sasl.spec
$ cvs diff -u -r1.26 -r1.27 sasl.spec
--- openpkg-src/sasl/sasl.spec10 Aug 2002 14:10:44 - 1.26
+++ openpkg-src/sasl/sasl.spec12 Aug 2002 08:04:38 - 1.27
@@ -38,10 +38,11 @@
Group:Cryptography
License: BSD
Version: 2.1.7
-Release: 20020810
+Release: 20020811
# list of sources
Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-%{version}.tar.gz
+Source1: rc.sasl
# build information
Prefix: %{l_prefix}
@@ -65,6 +66,9 @@
%prep
%setup -q -n cyrus-sasl-%{version}
+%{l_shtool} subst \
+-e 's;^ *for dbname in ;for dbname in db ;' \
+configure
%build
%{l_shtool} subst \
@@ -101,9 +105,20 @@
rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
%{l_shtool} mkdir -f -p -m 755 \
+$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
+%{l_shtool} install -c -m 755 \
+-e 's;@l_prefix@;%{l_prefix};g' \
+%if "%{with_pam}" == "yes"
+-e 's;@authmech@;pam;g' \
+%else
+-e 's;@authmech@;getpwent;g' \
+%endif
+%{SOURCE rc.sasl} \
+$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/var/sasl/saslauthd
mv $RPM_BUILD_ROOT%{l_prefix}/lib/sasl2 \
- $RPM_BUILD_ROOT%{l_prefix}/lib/sasl
+$RPM_BUILD_ROOT%{l_prefix}/lib/sasl
strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
