[CVS] OpenPKG: openpkg-src/proftpd/ proftpd.spec openpkg-web/ news.txt
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:
RevisionChanges 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 - 1.67
+++ openpkg-src/proftpd/proftpd.spec 29 Jul 2003 08:23:43 - 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})
[CVS] OpenPKG: openpkg-src/proftpd/ proftpd.spec openpkg-web/ news.txt
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 openpkg-web Date: 07-Jul-2003 15:06:12
Branch: HEAD Handle: 2003070714061101
Modified files:
openpkg-src/proftpd proftpd.spec
openpkg-web news.txt
Log:
add libraries to PreReq
Summary:
RevisionChanges Path
1.57+8 -4 openpkg-src/proftpd/proftpd.spec
1.5400 +1 -0 openpkg-web/news.txt
patch -p0 '@@ .'
Index: openpkg-src/proftpd/proftpd.spec
$ cvs diff -u -r1.56 -r1.57 proftpd.spec
--- openpkg-src/proftpd/proftpd.spec 4 Jul 2003 14:01:40 - 1.56
+++ openpkg-src/proftpd/proftpd.spec 7 Jul 2003 13:06:12 - 1.57
@@ -33,7 +33,7 @@
Group:FTP
License: GPL
Version: 1.2.8
-Release: 20030704
+Release: 20030707
# package options
%option with_mysql no
@@ -57,10 +57,13 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg = 20030103, ncurses, getopt, make
-PreReq: OpenPKG, openpkg = 20030103, ncurses
+BuildPreReq: OpenPKG, openpkg = 20030103, make
+PreReq: OpenPKG, openpkg = 20030103
+BuildPreReq: ncurses, getopt
+PreReq: ncurses, getopt
%if %{with_mysql} == yes
BuildPreReq: mysql
+PreReq: mysql
%endif
%if %{with_pam} == yes
BuildPreReq: PAM
@@ -68,10 +71,11 @@
%endif
%if %{with_pgsql} == yes
BuildPreReq: postgresql, openssl
+PreReq: postgresql, openssl
%endif
%if %{with_ldap} == yes
BuildPreReq: openldap, openssl
-PreReq: openldap
+PreReq: openldap, openssl
%endif
AutoReq: no
AutoReqProv: no
@@ .
patch -p0 '@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.5399 -r1.5400 news.txt
--- openpkg-web/news.txt 7 Jul 2003 13:04:41 - 1.5399
+++ openpkg-web/news.txt 7 Jul 2003 13:06:11 - 1.5400
@@ -1,3 +1,4 @@
+07-Jul-2003: Upgraded package: Pproftpd-1.2.8-20030707
07-Jul-2003: Upgraded package: Ppound-1.4-20030707
07-Jul-2003: Upgraded package: Ppostgresql-7.3.3-20030707
07-Jul-2003: Upgraded package: Ppostfix-2.0.13-20030707
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/proftpd/ proftpd.spec openpkg-web/ news.txt
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: 04-Jul-2003 16:01:41
Branch: HEAD Handle: 2003070415013802
Modified files:
openpkg-src/proftpd proftpd.spec
openpkg-web news.txt
Log:
mysql3 is a 'faked' package for mysql (and not an 'alternative'
package as our definition states), so configure it and use it this way
Summary:
RevisionChanges Path
1.56+2 -2 openpkg-src/proftpd/proftpd.spec
1.5258 +1 -0 openpkg-web/news.txt
patch -p0 '@@ .'
Index: openpkg-src/proftpd/proftpd.spec
$ cvs diff -u -r1.55 -r1.56 proftpd.spec
--- openpkg-src/proftpd/proftpd.spec 2 Jul 2003 15:25:55 - 1.55
+++ openpkg-src/proftpd/proftpd.spec 4 Jul 2003 14:01:40 - 1.56
@@ -33,7 +33,7 @@
Group:FTP
License: GPL
Version: 1.2.8
-Release: 20030702
+Release: 20030704
# package options
%option with_mysql no
@@ -60,7 +60,7 @@
BuildPreReq: OpenPKG, openpkg = 20030103, ncurses, getopt, make
PreReq: OpenPKG, openpkg = 20030103, ncurses
%if %{with_mysql} == yes
-BuildPreReq: MYSQL
+BuildPreReq: mysql
%endif
%if %{with_pam} == yes
BuildPreReq: PAM
@@ .
patch -p0 '@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.5257 -r1.5258 news.txt
--- openpkg-web/news.txt 4 Jul 2003 14:01:27 - 1.5257
+++ openpkg-web/news.txt 4 Jul 2003 14:01:38 - 1.5258
@@ -1,3 +1,4 @@
+04-Jul-2003: Upgraded package: Pproftpd-1.2.8-20030704
04-Jul-2003: Upgraded package: Ppowerdns-2.9.10-20030704
04-Jul-2003: Upgraded package: Ppostfix-2.0.13-20030704
04-Jul-2003: Upgraded package: Pphp-4.3.2-20030704
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
Re: [CVS] OpenPKG: openpkg-src/proftpd/ proftpd.spec openpkg-web/ news.txt
On Tue, Jun 10, 2003, Ralf S. Engelschall wrote: The PreReq dependency is required to trigger rebuilds because this is the only kind stored by rpm in the package database. The BuildPreReq information is lost. But one can argue that it is just fair that RPM throws this info away now (after installing) it is no longer required for it. You can only guess about the reasoning behind RPM, after all the PreReq conditions are not exactly the right information either. RPM implements a much more powerful (but also informal and error-prone) mechanism to describe other kinds of dependencies, including the need-to-rebuild which is triggers. Something we, safely, do not use. Index information cannot be used as a substitute because it is only valid for packages in the repository which often do have dependencies different from installed packages. Can you provide more details or an example? I'm not sure whether I understand this correctly. program A requires library B. program A is upgraded in the repository to use its own implementation C. library B is upgraded in the repository. Let's say a security issue. Users will upgrade library B but will not rebuild program A which no longer depends on library B _in the repository_. However, they are still using the older version of program A which still contains the vulnerable version of library B. Now you could say that security advisories will catch this, but if this is not security relevant, but just a bugfix I don't think that we will tell every user that there is a hidden dependency. -- ,eM=.a-. Michael van Elst dWWMWM - :GM==;[EMAIL PROTECTED] :WWMWMw=--. W=' cable wireless 9WWMm==-. -Wmw- CABLE WIRELESS __ The OpenPKG Projectwww.openpkg.org Developer Communication List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/proftpd/ proftpd.spec openpkg-web/ news.txt
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: 09-Jun-2003 17:56:22
Branch: HEAD Handle: 2003060916562101
Modified files:
openpkg-src/proftpd proftpd.spec
openpkg-web news.txt
Log:
no, proftpd certainly does not require getopt under runtime
Summary:
RevisionChanges Path
1.53+2 -2 openpkg-src/proftpd/proftpd.spec
1.4781 +1 -0 openpkg-web/news.txt
patch -p0 '@@ .'
Index: openpkg-src/proftpd/proftpd.spec
$ cvs diff -u -r1.52 -r1.53 proftpd.spec
--- openpkg-src/proftpd/proftpd.spec 6 Jun 2003 16:38:14 - 1.52
+++ openpkg-src/proftpd/proftpd.spec 9 Jun 2003 15:56:22 - 1.53
@@ -33,7 +33,7 @@
Group:FTP
License: GPL
Version: 1.2.8
-Release: 20030606
+Release: 20030609
# package options
%option with_mysql no
@@ -57,7 +57,7 @@
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
BuildPreReq: OpenPKG, openpkg = 20030103, ncurses, getopt, make
-PreReq: OpenPKG, openpkg = 20030103, ncurses, getopt
+PreReq: OpenPKG, openpkg = 20030103, ncurses
%if %{with_mysql} == yes
BuildPreReq: MYSQL
%endif
@@ .
patch -p0 '@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.4780 -r1.4781 news.txt
--- openpkg-web/news.txt 9 Jun 2003 15:55:14 - 1.4780
+++ openpkg-web/news.txt 9 Jun 2003 15:56:21 - 1.4781
@@ -1,3 +1,4 @@
+09-Jun-2003: Upgraded package: Pproftpd-1.2.8-20030609
09-Jun-2003: Upgraded package: Pgetopt-20030307-20030609
09-Jun-2003: Upgraded package: Pgtk2-2.2.1-20030609
09-Jun-2003: New package: Pnessus-tool-2.0.6a-20030609
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
Re: [CVS] OpenPKG: openpkg-src/proftpd/ proftpd.spec openpkg-web/ news.txt
On Mon, Jun 09, 2003, Ralf S. Engelschall wrote: Log: no, proftpd certainly does not require getopt under runtime Whatever you say. But it is linked against libgetopt and without the depdency it won't get rebuilt when libgetopt is updated. -- ,eM=.a-. Michael van Elst dWWMWM - :GM==;[EMAIL PROTECTED] :WWMWMw=--. W=' cable wireless 9WWMm==-. -Wmw- CABLE WIRELESS __ The OpenPKG Projectwww.openpkg.org Developer Communication List [EMAIL PROTECTED]
Re: [CVS] OpenPKG: openpkg-src/proftpd/ proftpd.spec openpkg-web/ news.txt
On Mon, Jun 09, 2003, Michael van Elst wrote: Log: no, proftpd certainly does not require getopt under runtime Whatever you say. But it is linked against libgetopt and without the depdency it won't get rebuilt when libgetopt is updated. I'm not sure whether I understand your correctly. Are you talking about a not triggered rebuild in openpkg-tool or about the fact that the package does break on a plain rebuilding? I guess you're talking about the first. And here I do not understand: in all of our applications, we never have a run-time dependency to libraries which were needed under build-time. The only exceptions are things like ncurses which is also a run-time beast for applications. But if an application like proftpd just links against libgetopt.a, it technically and from the RPM point of view correctly does not require the getopt package under run-time. Whether proftpd then should be nevertheless rebuiled if getopt is updated, is a pure openpkg-tool issue. Intuitively, it should be not rebuilded by default (because the installed proftpd no longer needs the installed getopt). But I would expect that openpkg-tool provides a enforce rebuild paranoia ;-) option which extends the run-time deps with the build-time deps to allow us to enforce the automatic rebuilding of proftpd here. Anyway, keep in mind that this is non-proftpd specific. All(!) of our application packages which have just build-time deps are affected by this behaviour of openpkg-tool AFAIK. So, optionally extending the rebuilding scope of openpkg-tool could be reasonable, couldn't it? Ralf S. Engelschall [EMAIL PROTECTED] www.engelschall.com __ The OpenPKG Projectwww.openpkg.org Developer Communication List [EMAIL PROTECTED]
Re: [CVS] OpenPKG: openpkg-src/proftpd/ proftpd.spec openpkg-web/ news.txt
On Mon, Jun 09, 2003, Ralf S. Engelschall wrote: I'm not sure whether I understand your correctly. Are you talking about a not triggered rebuild in openpkg-tool or about the fact that the package does break on a plain rebuilding? I guess you're talking about the first. And here I do not understand: in all of our applications, we never have a run-time dependency to libraries which were needed under build-time. I beg to differ, we have many such dependencies. Dependencies to libraries are very often copied in BuildPreReq and PreReq. The PreReq dependency is required to trigger rebuilds because this is the only kind stored by rpm in the package database. The BuildPreReq information is lost. Index information cannot be used as a substitute because it is only valid for packages in the repository which often do have dependencies different from installed packages. N.B. whenever we start supporting shared libraries then the runtime dependency is even required for correct functioning of the dependent packages. -- ,eM=.a-. Michael van Elst dWWMWM - :GM==;[EMAIL PROTECTED] :WWMWMw=--. W=' cable wireless 9WWMm==-. -Wmw- CABLE WIRELESS __ The OpenPKG Projectwww.openpkg.org Developer Communication List [EMAIL PROTECTED]
Re: [CVS] OpenPKG: openpkg-src/proftpd/ proftpd.spec openpkg-web/ news.txt
On Tue, Jun 10, 2003 at 12:51:07AM +0200, Michael van Elst wrote: ... N.B. whenever we start supporting shared libraries then the runtime dependency is even required for correct functioning of the dependent packages. Speaking of shared libraries, I'll ask the same question I've asked a couple of times, but never received an answer. Don't the unixodbc and myodbc packages require building with shared libraries since they need them for use with programs like StarOffice and OpenOffice.org to implement data sources under Linux and Unix? Bill -- INTERNET: [EMAIL PROTECTED] Bill Campbell; Celestial Software LLC UUCP: camco!bill PO Box 820; 6641 E. Mercer Way FAX:(206) 232-9186 Mercer Island, WA 98040-0820; (206) 236-1676 URL: http://www.celestial.com/ What's this script do? unzip ; touch ; finger ; mount ; gasp ; yes ; umount ; sleep Hint for the answer: not everything is computer-oriented. Sometimes you're in a sleeping bag, camping out. (Contributed by Frans van der Zande.) __ The OpenPKG Projectwww.openpkg.org Developer Communication List [EMAIL PROTECTED]
Re: [CVS] OpenPKG: openpkg-src/proftpd/ proftpd.spec openpkg-web/ news.txt
Bill, Don't the unixodbc and myodbc packages require building with shared libraries since they need them for use with programs like StarOffice and OpenOffice.org to implement data sources under Linux and Unix? I do not know, but I would expect that these packages will load shared objects similar to perl which loads shared objects for modules written in C. Greetings, -- ,eM=.a-. Michael van Elst dWWMWM - :GM==;[EMAIL PROTECTED] :WWMWMw=--. W=' cable wireless 9WWMm==-. -Wmw- CABLE WIRELESS __ The OpenPKG Projectwww.openpkg.org Developer Communication List [EMAIL PROTECTED]
Re: [CVS] OpenPKG: openpkg-src/proftpd/ proftpd.spec openpkg-web/ news.txt
On Tue, Jun 10, 2003 at 01:14:12AM +0200, Michael van Elst wrote: Bill, Don't the unixodbc and myodbc packages require building with shared libraries since they need them for use with programs like StarOffice and OpenOffice.org to implement data sources under Linux and Unix? I do not know, but I would expect that these packages will load shared objects similar to perl which loads shared objects for modules written in C. I don't think so. The packages now only create the .a library files while programs like OpenOffice.org have to make run-time links to the .so or equivalent libraries. The unixodbc configurations for databases have ascii configuration files that require specifying shared libraries for each database type. I've been afraid to look closely at the internals of perl's shared libraries, but I think it needs to do run-time linking to shared libraries for modules that aren't built with static libraries. The perl modules such as DB_File build against the libdb.a static library so while they're load dynamically, perl's code has the static library links. If one were to build openffice.org under openpkg, the static libraries would be sufficient. I don't know of anybody who's tackled that job yet (I think it makes building mozilla look trivial by comparison). Bill -- INTERNET: [EMAIL PROTECTED] Bill Campbell; Celestial Software LLC UUCP: camco!bill PO Box 820; 6641 E. Mercer Way FAX:(206) 232-9186 Mercer Island, WA 98040-0820; (206) 236-1676 URL: http://www.celestial.com/ ``Freedom from prices is freedom from responsibility. You can simply pass laws, using the magic wand of government to satisfy your own desires at unspecified costs to be paid by others.'' -- Thomas Sowell Aug 2000 __ The OpenPKG Projectwww.openpkg.org Developer Communication List [EMAIL PROTECTED]
Re: [CVS] OpenPKG: openpkg-src/proftpd/ proftpd.spec openpkg-web/ news.txt
On Tue, Jun 10, 2003, Michael van Elst wrote: I'm not sure whether I understand your correctly. Are you talking about a not triggered rebuild in openpkg-tool or about the fact that the package does break on a plain rebuilding? I guess you're talking about the first. And here I do not understand: in all of our applications, we never have a run-time dependency to libraries which were needed under build-time. I beg to differ, we have many such dependencies. Dependencies to libraries are very often copied in BuildPreReq and PreReq. Then those packages are incorrect IMHO. The PreReq dependency is required to trigger rebuilds because this is the only kind stored by rpm in the package database. The BuildPreReq information is lost. But one can argue that it is just fair that RPM throws this info away now (after installing) it is no longer required for it. Index information cannot be used as a substitute because it is only valid for packages in the repository which often do have dependencies different from installed packages. Can you provide more details or an example? I'm not sure whether I understand this correctly. N.B. whenever we start supporting shared libraries then the runtime dependency is even required for correct functioning of the dependent packages. Yes, of course. But if we move to _shared_ libraries, then the library packages are really technically run-time dependencies ;-) Ralf S. Engelschall [EMAIL PROTECTED] www.engelschall.com __ The OpenPKG Projectwww.openpkg.org Developer Communication List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/proftpd/ proftpd.spec openpkg-web/ news.txt
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 openpkg-web Date: 06-Jun-2003 12:29:27
Branch: HEAD Handle: 2003060611292601
Modified files:
openpkg-src/proftpd proftpd.spec
openpkg-web news.txt
Log:
use getopt package to avoid conflicts, require openssl for postgresl
Summary:
RevisionChanges Path
1.51+17 -4 openpkg-src/proftpd/proftpd.spec
1.4754 +1 -0 openpkg-web/news.txt
patch -p0 '@@ .'
Index: openpkg-src/proftpd/proftpd.spec
$ cvs diff -u -r1.50 -r1.51 proftpd.spec
--- openpkg-src/proftpd/proftpd.spec 5 Jun 2003 06:43:12 - 1.50
+++ openpkg-src/proftpd/proftpd.spec 6 Jun 2003 10:29:27 - 1.51
@@ -33,7 +33,7 @@
Group:FTP
License: GPL
Version: 1.2.8
-Release: 20030605
+Release: 20030606
# package options
%option with_mysql no
@@ -50,8 +50,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg = 20030103, ncurses, make
-PreReq: OpenPKG, openpkg = 20030103, ncurses
+BuildPreReq: OpenPKG, openpkg = 20030103, ncurses, getopt, make
+PreReq: OpenPKG, openpkg = 20030103, ncurses, getopt
%if %{with_mysql} == yes
BuildPreReq: MYSQL
%endif
@@ -60,7 +60,7 @@
PreReq: PAM
%endif
%if %{with_pgsql} == yes
-BuildPreReq: postgresql
+BuildPreReq: postgresql, openssl
%endif
AutoReq: no
AutoReqProv: no
@@ -83,6 +83,17 @@
%prep
%setup -q
+# utils also require link with getopt
+%{l_shtool} subst \
+-e 's;\(\$(BUILD_FTPCOUNT_OBJS).*\);\1 %{l_ldflags} -lgetopt;g' \
+-e 's;\(\$(BUILD_FTPSHUT_OBJS).*\);\1 %{l_ldflags} -lgetopt;g' \
+-e 's;\(\$(BUILD_FTPTOP_OBJS).*\);\1 %{l_ldflags} -lgetopt;g' \
+-e 's;\(\$(BUILD_FTPWHO_OBJS).*\);\1 %{l_ldflags} -lgetopt;g' \
+Makefile.in
+# libpq also requires openssl
+%{l_shtool} subst \
+-e 's;-lpq;-lpq -lssl -lcrypto;g' \
+contrib/mod_sql_postgres.c
%build
# make non-standard rundir the same as standard sysconfdir
@@ -120,6 +131,7 @@
%else
CPPFLAGS=%{l_cppflags ncurses} \
LDFLAGS=%{l_ldflags} \
+LIBS=-lgetopt \
%endif
./configure \
--prefix=%{l_prefix} \
@@ -128,6 +140,7 @@
--with-modules=$MOD \
--with-includes=$MOD_INC \
--with-libraries=$MOD_LIB \
+--without-getopt \
%if %{with_pam} == yes
--enable-auth-pam
%else
@@ .
patch -p0 '@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.4753 -r1.4754 news.txt
--- openpkg-web/news.txt 6 Jun 2003 10:02:57 - 1.4753
+++ openpkg-web/news.txt 6 Jun 2003 10:29:26 - 1.4754
@@ -1,3 +1,4 @@
+06-Jun-2003: Upgraded package: Pproftpd-1.2.8-20030606
06-Jun-2003: New package: Pghostscript-esp-7.05.6-20030606
06-Jun-2003: New package: Pcups-1.1.19-20030606
06-Jun-2003: Upgraded package: Pbind-9.2.2-20030606
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/proftpd/ proftpd.spec openpkg-web/ news.txt
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: 05-Jun-2003 08:43:12
Branch: HEAD Handle: 2003060507431101
Modified files:
openpkg-src/proftpd proftpd.spec
openpkg-web news.txt
Log:
fixed PAM, added MySQL and PostgreSQL support
Summary:
RevisionChanges Path
1.50+32 -4 openpkg-src/proftpd/proftpd.spec
1.4731 +1 -0 openpkg-web/news.txt
patch -p0 '@@ .'
Index: openpkg-src/proftpd/proftpd.spec
$ cvs diff -u -r1.49 -r1.50 proftpd.spec
--- openpkg-src/proftpd/proftpd.spec 27 May 2003 17:18:03 - 1.49
+++ openpkg-src/proftpd/proftpd.spec 5 Jun 2003 06:43:12 - 1.50
@@ -33,10 +33,12 @@
Group:FTP
License: GPL
Version: 1.2.8
-Release: 20030527
+Release: 20030605
# package options
-%option with_pam no
+%option with_mysql no
+%option with_pamno
+%option with_pgsql no
# list of sources
Source0: ftp://ftp.proftpd.net/distrib/source/proftpd-%{version}.tar.bz2
@@ -50,10 +52,16 @@
BuildRoot:%{l_buildroot}
BuildPreReq: OpenPKG, openpkg = 20030103, ncurses, make
PreReq: OpenPKG, openpkg = 20030103, ncurses
+%if %{with_mysql} == yes
+BuildPreReq: MYSQL
+%endif
%if %{with_pam} == yes
BuildPreReq: PAM
PreReq: PAM
%endif
+%if %{with_pgsql} == yes
+BuildPreReq: postgresql
+%endif
AutoReq: no
AutoReqProv: no
@@ -88,6 +96,22 @@
include/default_paths.h
# configure the ProFTPd source tree
+MOD=mod_ratio:mod_readme
+MOD_INC=%{l_prefix}/include
+MOD_LIB=%{l_prefix}/lib
+%if %{with_mysql} == yes || %{with_pgsql} == yes
+MOD=$MOD:mod_sql
+%if %{with_mysql} == yes
+MOD=$MOD:mod_sql_mysql
+MOD_LIB=MOD_LIB:%{l_prefix}/lib/mysql
+%endif
+%if %{with_pgsql} == yes
+MOD=$MOD:mod_sql_postgres
+%{l_shtool} subst \
+-e 's;^\(#include \)pgsql/\(libpq-fe.h.*\)$;\1\2;' \
+contrib/mod_sql_postgres.c
+%endif
+%endif
CC=%{l_cc} \
CFLAGS=%{l_cflags -O} \
%if %{with_pam} == yes
@@ -101,9 +125,13 @@
--prefix=%{l_prefix} \
--sysconfdir=%{l_prefix}/etc/proftpd \
--localstatedir=%{l_prefix}/var/proftpd \
---with-modules=mod_ratio:mod_readme \
+--with-modules=$MOD \
+--with-includes=$MOD_INC \
+--with-libraries=$MOD_LIB \
%if %{with_pam} == yes
---enable-pam
+--enable-auth-pam
+%else
+--disable-auth-pam
%endif
# build ProFTPd programs
@@ .
patch -p0 '@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.4730 -r1.4731 news.txt
--- openpkg-web/news.txt 5 Jun 2003 05:59:32 - 1.4730
+++ openpkg-web/news.txt 5 Jun 2003 06:43:11 - 1.4731
@@ -1,3 +1,4 @@
+05-Jun-2003: Upgraded package: Pproftpd-1.2.8-20030605
05-Jun-2003: Upgraded package: Pperl-dbix-20030605-20030605
05-Jun-2003: Upgraded package: Prt-3.0.2-20030605
05-Jun-2003: Upgraded package: Psendmail-8.12.9-20030605
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/proftpd/ proftpd.spec openpkg-web/ news.txt
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: 22-Feb-2003 21:31:37
Branch: HEAD Handle: 200300313502
Modified files:
openpkg-src/proftpd proftpd.spec
openpkg-web news.txt
Log:
Repair so that l_prefix/sbin/ftpshut writes to within native instance
only
Summary:
RevisionChanges Path
1.45+6 -1 openpkg-src/proftpd/proftpd.spec
1.3413 +1 -0 openpkg-web/news.txt
patch -p0 ' .'
Index: openpkg-src/proftpd/proftpd.spec
$ cvs diff -u -r1.44 -r1.45 proftpd.spec
--- openpkg-src/proftpd/proftpd.spec 20 Jan 2003 11:31:23 - 1.44
+++ openpkg-src/proftpd/proftpd.spec 22 Feb 2003 20:31:37 - 1.45
-33,7 +33,7
Group:FTP
License: GPL
Version: 1.2.7
-Release: 20030120
+Release: 20030222
# package options
%option with_pam no
-83,6 +83,11
%{l_shtool} subst \
-e 's;^\([EMAIL PROTECTED]@\)/proftpd;\1;' \
Make.rules.in
+
+# write shutdown message file to OpenPKG instance, not outside
+%{l_shtool} subst \
+-e 's;\(#define
SHUTMSG_PATH.*\)\(/etc/\)\(shutmsg\);\1%{l_prefix}\2%{name}/\3;' \
+include/default_paths.h
# configure the ProFTPd source tree
CC=%{l_cc} \
.
patch -p0 ' .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.3412 -r1.3413 news.txt
--- openpkg-web/news.txt 22 Feb 2003 15:45:36 - 1.3412
+++ openpkg-web/news.txt 22 Feb 2003 20:31:35 - 1.3413
-1,3 +1,4
+22-Feb-2003: Upgraded package: Pproftpd-1.2.7-20030222
22-Feb-2003: Upgraded package: Pimagemagick-5.5.5.0-20030222
22-Feb-2003: Upgraded package: Ptetex-2.0.1-20030222
22-Feb-2003: Upgraded package: Pindent-2.2.8a-20030222
.
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/proftpd proftpd.spec openpkg-web news.txt
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: 19-Dec-2002 11:03:37
Branch: HEAD Handle: 2002121910033601
Modified files:
openpkg-src/proftpd proftpd.spec
openpkg-web news.txt
Log:
ncurses is also a run-time dependency
Summary:
RevisionChanges Path
1.38+3 -3 openpkg-src/proftpd/proftpd.spec
1.2331 +1 -0 openpkg-web/news.txt
Index: openpkg-src/proftpd/proftpd.spec
$ cvs diff -u -r1.37 -r1.38 proftpd.spec
--- openpkg-src/proftpd/proftpd.spec 8 Dec 2002 09:09:11 - 1.37
+++ openpkg-src/proftpd/proftpd.spec 19 Dec 2002 10:03:37 - 1.38
@@ -38,7 +38,7 @@
Group:FTP
License: GPL
Version: 1.2.7
-Release: 20021208
+Release: 20021219
# list of sources
Source0: ftp://ftp.proftpd.net/distrib/source/proftpd-%{version}.tar.bz2
@@ -50,8 +50,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg = 20021204, make, ncurses
-PreReq: OpenPKG, openpkg = 20021204
+BuildPreReq: OpenPKG, openpkg = 20021204, ncurses, make
+PreReq: OpenPKG, openpkg = 20021204, ncurses
%if %{with_pam} == yes
BuildPreReq: PAM
PreReq: PAM
Index: openpkg-web/news.txt
$ cvs diff -u -r1.2330 -r1.2331 news.txt
--- openpkg-web/news.txt 19 Dec 2002 08:43:16 - 1.2330
+++ openpkg-web/news.txt 19 Dec 2002 10:03:36 - 1.2331
@@ -1,3 +1,4 @@
+19-Dec-2002: Upgraded package: Pproftpd-1.2.7-20021219
19-Dec-2002: Upgraded package: Pperl-5.8.0-20021219
19-Dec-2002: Upgraded package: Pexim-4.12-20021219
19-Dec-2002: Upgraded package: Pperl-dbi-20021219-20021219
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/proftpd proftpd.spec openpkg-web news.txt
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-Dec-2002 10:09:11
Branch: HEAD Handle: 2002120809091001
Modified files:
openpkg-src/proftpd proftpd.spec
openpkg-web news.txt
Log:
make sure it really finds the ncurses stuff now
Summary:
RevisionChanges Path
1.37+7 -7 openpkg-src/proftpd/proftpd.spec
1.2219 +1 -0 openpkg-web/news.txt
Index: openpkg-src/proftpd/proftpd.spec
$ cvs diff -u -r1.36 -r1.37 proftpd.spec
--- openpkg-src/proftpd/proftpd.spec 7 Dec 2002 20:37:51 - 1.36
+++ openpkg-src/proftpd/proftpd.spec 8 Dec 2002 09:09:11 - 1.37
@@ -38,7 +38,7 @@
Group:FTP
License: GPL
Version: 1.2.7
-Release: 20021207
+Release: 20021208
# list of sources
Source0: ftp://ftp.proftpd.net/distrib/source/proftpd-%{version}.tar.bz2
@@ -50,8 +50,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg = 20020206, make, ncurses
-PreReq: OpenPKG, openpkg = 20020206
+BuildPreReq: OpenPKG, openpkg = 20021204, make, ncurses
+PreReq: OpenPKG, openpkg = 20021204
%if %{with_pam} == yes
BuildPreReq: PAM
PreReq: PAM
@@ -91,11 +91,11 @@
CC=%{l_cc} \
CFLAGS=%{l_cflags -O} \
%if %{with_pam} == yes
-CPPFLAGS=-I%{l_prefix}/include/ncurses -I`%{l_prefix}/etc/rc --query
pam_incdir` \
-LDFLAGS=-L%{l_prefix}/lib -L`%{l_prefix}/etc/rc --query pam_libdir` \
+CPPFLAGS=%{l_cppflags ncurses} -I`%{l_prefix}/etc/rc --query pam_incdir` \
+LDFLAGS=%{l_ldflags} -L`%{l_prefix}/etc/rc --query pam_libdir` \
%else
-CPPFLAGS=-I%{l_prefix}/include/ncurses \
-LDFLAGS=-L%{l_prefix}/lib \
+CPPFLAGS=%{l_cppflags ncurses} \
+LDFLAGS=%{l_ldflags} \
%endif
./configure \
--prefix=%{l_prefix} \
Index: openpkg-web/news.txt
$ cvs diff -u -r1.2218 -r1.2219 news.txt
--- openpkg-web/news.txt 8 Dec 2002 09:03:43 - 1.2218
+++ openpkg-web/news.txt 8 Dec 2002 09:09:10 - 1.2219
@@ -1,3 +1,4 @@
+08-Dec-2002: Upgraded package: Pproftpd-1.2.7-20021208
08-Dec-2002: Upgraded package: Pethereal-0.9.8-20021208
08-Dec-2002: Upgraded package: Pncurses-5.3.20021206-20021208
08-Dec-2002: Upgraded package: Pxmake-1.06-20021208
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/proftpd proftpd.spec openpkg-web news.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 06-Dec-2002 19:00:25
Branch: HEAD Handle: 2002120618002103
Modified files:
openpkg-src/proftpd proftpd.spec
openpkg-web news.txt
Log:
Catch ncurses dependency in ftptop.c, and Sankt Nikolaus commit.
Summary:
RevisionChanges Path
1.35+7 -4 openpkg-src/proftpd/proftpd.spec
1.2209 +1 -0 openpkg-web/news.txt
Index: openpkg-src/proftpd/proftpd.spec
$ cvs diff -u -r1.34 -r1.35 proftpd.spec
--- openpkg-src/proftpd/proftpd.spec 5 Dec 2002 19:31:23 - 1.34
+++ openpkg-src/proftpd/proftpd.spec 6 Dec 2002 18:00:24 - 1.35
@@ -38,7 +38,7 @@
Group:FTP
License: GPL
Version: 1.2.7
-Release: 20021205
+Release: 20021206
# list of sources
Source0: ftp://ftp.proftpd.net/distrib/source/proftpd-%{version}.tar.bz2
@@ -50,7 +50,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg = 20020206, make
+BuildPreReq: OpenPKG, openpkg = 20020206, make, ncurses
PreReq: OpenPKG, openpkg = 20020206
%if %{with_pam} == yes
BuildPreReq: PAM
@@ -91,8 +91,11 @@
CC=%{l_cc} \
CFLAGS=%{l_cflags -O} \
%if %{with_pam} == yes
-CPPFLAGS=-I`%{l_prefix}/etc/rc --query pam_incdir` \
-LDFLAGS=-L`%{l_prefix}/etc/rc --query pam_libdir` \
+CPPFLAGS=-I%{l_prefix}/include/ncurses -I`%{l_prefix}/etc/rc --query
pam_incdir` \
+LDFLAGS=-L%{l_prefix}/lib -L`%{l_prefix}/etc/rc --query pam_libdir` \
+%else
+CPPFLAGS=-I%{l_prefix}/include/ncurses \
+LDFLAGS=-L%{l_prefix}/lib \
%endif
./configure \
--prefix=%{l_prefix} \
Index: openpkg-web/news.txt
$ cvs diff -u -r1.2208 -r1.2209 news.txt
--- openpkg-web/news.txt 6 Dec 2002 13:31:50 - 1.2208
+++ openpkg-web/news.txt 6 Dec 2002 18:00:21 - 1.2209
@@ -1,3 +1,4 @@
+06-Dec-2002: Upgraded package: Pproftpd-1.2.7-20021206
06-Dec-2002: Upgraded package: Psamhain-1.6.5-20021206
06-Dec-2002: Upgraded package: Pmajordomo-1.94.5-20021206
06-Dec-2002: New package: Pxerces-c-2.1.0-20021206
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
