OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 29-Jul-2003 10:23:44
Branch: HEAD Handle: 2003072909234201
Modified files:
openpkg-src/proftpd proftpd.spec
openpkg-web news.txt
Log:
config might contain db password -> read-only; cosmetics
Summary:
Revision Changes Path
1.68 +22 -17 openpkg-src/proftpd/proftpd.spec
1.5887 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.spec
============================================================================
$ cvs diff -u -r1.67 -r1.68 proftpd.spec
--- openpkg-src/proftpd/proftpd.spec 22 Jul 2003 14:22:25 -0000 1.67
+++ openpkg-src/proftpd/proftpd.spec 29 Jul 2003 08:23:43 -0000 1.68
@@ -33,7 +33,7 @@
Group: FTP
License: GPL
Version: 1.2.8
-Release: 20030722
+Release: 20030729
# package options
%option with_mysql no
@@ -81,20 +81,21 @@
AutoReqProv: no
%description
- ProFTPD grew out of the desire to have a secure and configurable FTP
- server, and out of a significant admiration of the Apache web server.
- There are currently a very limited number of FTP servers running on unix
- (or unix-like) hosts. The most commonly used server is probably wu-ftpd.
- While wu-ftpd provides excellent performance and is generally a good
- product, it lacks numerous features found in newer Win32 FTP servers, and
- has a poor security history. Many people, including the developers who
- work on ProFTPD have spent a great deal of time fixing bugs and hacking
- features into wu-ftpd. Unfortunately, it quickly became clear that a
- complete redesign was necessary in order to implement the configurability
- and features desired. ProFTPD is not a hack based on any other server,
- it's an independent source tree from the ground up. Click here for a small
- list of some of the sites ProFTPD powers -- many of them handling large
- volumes of traffic on a daily basis.
+ ProFTPD grew out of the desire to have a secure and configurable
+ FTP server, and out of a significant admiration of the Apache web
+ server. There are currently a very limited number of FTP servers
+ running on unix (or unix-like) hosts. The most commonly used server
+ is probably wu-ftpd. While wu-ftpd provides excellent performance
+ and is generally a good product, it lacks numerous features found
+ in newer Win32 FTP servers, and has a poor security history. Many
+ people, including the developers who work on ProFTPD have spent a
+ great deal of time fixing bugs and hacking features into wu-ftpd.
+ Unfortunately, it quickly became clear that a complete redesign was
+ necessary in order to implement the configurability and features
+ desired. ProFTPD is not a hack based on any other server, it's an
+ independent source tree from the ground up. Click here for a small
+ list of some of the sites ProFTPD powers -- many of them handling
+ large volumes of traffic on a daily basis.
%prep
%setup -q
@@ -114,7 +115,7 @@
contrib/mod_sql_mysql.c
%endif
# libpq also requires openssl
- # postgresql also doesn't provide its own inlude subdirectory
+ # postgresql also doesn't provide its own include subdirectory
%{l_shtool} subst \
-e 's;\(-lpq\);\1 -lssl -lcrypto;g' \
-e 's;^\(#include <\)pgsql/\(libpq-fe.h>.*\)$;\1postgresql/\2;' \
@@ -143,9 +144,11 @@
MOD="$MOD:mod_sql"
%if "%{with_mysql}" == "yes"
MOD="$MOD:mod_sql_mysql"
+ MOD_INC=":%{l_prefix}/include/mysql"
%endif
%if "%{with_pgsql}" == "yes"
MOD="$MOD:mod_sql_postgres"
+ MOD_INC=":%{l_prefix}/include/postgresql"
%endif
%endif
%if "%{with_ldap}" == "yes"
@@ -193,6 +196,8 @@
%{l_make} %{l_mflags} \
install-proftpd install-utils install-man \
prefix=$RPM_BUILD_ROOT%{l_prefix} \
+ bindir=$RPM_BUILD_ROOT%{l_prefix}/bin \
+ sbindir=$RPM_BUILD_ROOT%{l_prefix}/sbin \
sysconfdir=$RPM_BUILD_ROOT%{l_prefix}/etc/proftpd \
localstatedir=$RPM_BUILD_ROOT%{l_prefix}/var/proftpd \
rundir=$RPM_BUILD_ROOT%{l_prefix}/var/proftpd
@@ -232,7 +237,7 @@
# determine the package ingredients
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
- '%config %{l_prefix}/etc/proftpd/proftpd.conf'
+ '%config %attr(0600,%{l_susr},%{l_sgrp})
%{l_prefix}/etc/proftpd/proftpd.conf'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5886 -r1.5887 news.txt
--- openpkg-web/news.txt 29 Jul 2003 08:12:08 -0000 1.5886
+++ openpkg-web/news.txt 29 Jul 2003 08:23:42 -0000 1.5887
@@ -1,3 +1,4 @@
+29-Jul-2003: Upgraded package: P<proftpd-1.2.8-20030729>
29-Jul-2003: Upgraded package: P<emacs-21.3-20030729>
29-Jul-2003: Upgraded package: P<amavisd-20030616p2-20030729>
28-Jul-2003: Upgraded package: P<kerberos-1.2.8-20030728>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
