OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 08-Oct-2002 19:03:57
Branch: HEAD Handle: 2002100818035601
Modified files:
openpkg-src/proftpd proftpd.conf proftpd.spec
openpkg-web news.txt
Log:
do not use PAM-related configs in non-PAM world
Summary:
Revision Changes Path
1.8 +5 -5 openpkg-src/proftpd/proftpd.conf
1.33 +6 -1 openpkg-src/proftpd/proftpd.spec
1.1725 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
Index: openpkg-src/proftpd/proftpd.conf
============================================================
$ cvs diff -u -r1.7 -r1.8 proftpd.conf
--- openpkg-src/proftpd/proftpd.conf 7 Aug 2002 15:41:00 -0000 1.7
+++ openpkg-src/proftpd/proftpd.conf 8 Oct 2002 17:03:57 -0000 1.8
@@ -8,11 +8,6 @@
SocketBindTight on
Port none
-AuthPAM on
-AuthPAMConfig proftpd
-AuthPAMAuthoritative off
-#PersistentPassword off
-
MaxInstances 40
User @l_nusr@
Group @l_ngrp@
@@ -25,6 +20,11 @@
MaxLoginAttempts 2
RequireValidShell yes
LsDefaultOptions "-l"
+
+@l_pam@AuthPAM on
+@l_pam@AuthPAMConfig proftpd
+@l_pam@AuthPAMAuthoritative off
+#PersistentPassword off
TimeoutLogin 120
TimeoutNoTransfer 600
Index: openpkg-src/proftpd/proftpd.spec
============================================================
$ cvs diff -u -r1.32 -r1.33 proftpd.spec
--- openpkg-src/proftpd/proftpd.spec 16 Sep 2002 12:00:39 -0000 1.32
+++ openpkg-src/proftpd/proftpd.spec 8 Oct 2002 17:03:57 -0000 1.33
@@ -38,7 +38,7 @@
Group: FTP
License: GPL
Version: 1.2.6
-Release: 20020916
+Release: 20021008
# list of sources
Source0: ftp://ftp.proftpd.net/distrib/source/proftpd-%{version}.tar.bz2
@@ -136,10 +136,15 @@
$RPM_BUILD_ROOT%{l_prefix}/share/proftpd/cfg.html
# extended installation with own stuff
+ l_pam="#"
+%if "%{with_pam}" == "yes"
+ l_pam=""
+%endif
%{l_shtool} install -c -m 644 \
-e 's;@l_prefix@;%{l_prefix};g' \
-e 's;@l_nusr@;%{l_nusr};g' \
-e 's;@l_ngrp@;%{l_ngrp};g' \
+ -e "s;@l_pam@;${l_pam};g" \
%{SOURCE proftpd.conf} $RPM_BUILD_ROOT%{l_prefix}/etc/proftpd/
%{l_shtool} install -c -m 644 \
%{SOURCE proftpd.msg.goaway} \
Index: openpkg-web/news.txt
============================================================
$ cvs diff -u -r1.1724 -r1.1725 news.txt
--- openpkg-web/news.txt 8 Oct 2002 13:07:51 -0000 1.1724
+++ openpkg-web/news.txt 8 Oct 2002 17:03:56 -0000 1.1725
@@ -1,3 +1,4 @@
+08-Oct-2002: Upgraded package: P<proftpd-1.2.6-20021008>
08-Oct-2002: Upgraded package: P<bison-1.50-20021008>
08-Oct-2002: Upgraded package: P<vim-6.1.212-20021008>
08-Oct-2002: Upgraded package: P<tidy-20021007-20021008>
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
