[CVS] OpenPKG: openpkg-src/sgml/ catalog2xml mkcatalog sgml.spec sgmlc...
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: 05-Jun-2003 16:57:00
Branch: HEAD Handle: 2003060515565801
Added files:
openpkg-src/sgmlcatalog2xml sgmlcatalog
Modified files:
openpkg-src/sgmlmkcatalog sgml.spec
openpkg-web news.txt
Log:
add support for XML catalog, move old mkcatalog out of the way to
avoid SGML-catalog-only updates from old packages
Summary:
RevisionChanges Path
1.1 +22 -0 openpkg-src/sgml/catalog2xml
1.3 +3 -9 openpkg-src/sgml/mkcatalog
1.26+16 -6 openpkg-src/sgml/sgml.spec
1.1 +150 -0 openpkg-src/sgml/sgmlcatalog
1.4738 +1 -0 openpkg-web/news.txt
patch -p0 '@@ .'
Index: openpkg-src/sgml/catalog2xml
$ cvs diff -u -r0 -r1.1 catalog2xml
--- /dev/null 2003-06-05 16:56:59.0 +0200
+++ catalog2xml 2003-06-05 16:57:00.0 +0200
@@ -0,0 +1,22 @@
+#!/bin/sh
+
[EMAIL PROTECTED]@/bin:${PATH}
+
+echo ?xml version='1.0'?
+echo '!DOCTYPE catalog PUBLIC -//OASIS//DTD Entity Resolution XML Catalog
V1.0//EN http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd;'
+echo 'catalog xmlns=urn:oasis:names:tc:entity:xmlns:xml:catalog'
+
+if test $# != 0 ; then
+sed -n \
+-e ':input' \
+-e '/PUBLIC[^]*$/{ N; b input }' \
+-e '/PUBLIC[^]*[^]*$/{ N; b input }' \
+-e '/PUBLIC[^]*[^]*[^]*$/{ N; b input }' \
+-e '/PUBLIC[^]*[^]*[^]*[^]*$/{ N; b input }' \
+-e 's/\n/ /g' \
+-e 's/^ *\(--.*--\)/!\1/gp' \
+-e 's/PUBLIC *\([^]*\) *\([^]*\)/public publicId=\1 uri=\2\//gp' \
+$@
+fi
+
+echo '/catalog'
@@ .
patch -p0 '@@ .'
Index: openpkg-src/sgml/mkcatalog
$ cvs diff -u -r1.2 -r1.3 mkcatalog
--- openpkg-src/sgml/mkcatalog16 Jan 2003 16:38:47 - 1.2
+++ openpkg-src/sgml/mkcatalog5 Jun 2003 14:56:59 - 1.3
@@ -191,19 +191,13 @@
esac
;;
delete|deinstall)
-# if deinstall or delete and the temporary catalog is
-# not empty, install the catalog itself (in the case of being
-# empty, delete it). ${l_bottom_p}=YES means that
+# if deinstall or delete install the temporary catalog
+# ${l_bottom_p}=YES means that
# ${l_upper_cat} can be deleted safely, otherwise not.
case ${l_bottom_p} in
[Yy][Ee][Ss])
echo - ${dtd_act} ${l_cat_line} line from ${l_upper_cat}
-if [ ! -s ${TMPCAT} ]; then
-echo - delete empty catalog ${l_upper_cat}
-rm -f ${l_upper_abs_cat}
-else
-cp ${TMPCAT} ${l_upper_abs_cat} || exit 1
-fi
+cp ${TMPCAT} ${l_upper_abs_cat} || exit 1
;;
*) rm -f ${TMPCAT}
exit 0
@@ .
patch -p0 '@@ .'
Index: openpkg-src/sgml/sgml.spec
$ cvs diff -u -r1.25 -r1.26 sgml.spec
--- openpkg-src/sgml/sgml.spec30 May 2003 19:02:00 - 1.25
+++ openpkg-src/sgml/sgml.spec5 Jun 2003 14:56:59 - 1.26
@@ -32,17 +32,19 @@
Distribution: OpenPKG [PLUS]
Group:SGML
License: PD
-Version: 20030530
-Release: 20030530
+Version: 20030605
+Release: 20030605
# list of sources
Source0: mkcatalog
+Source1: sgmlcatalog
+Source2: catalog2xml
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
BuildPreReq: OpenPKG, openpkg = 20020206
-PreReq: OpenPKG, openpkg = 20020206, bash
+PreReq: OpenPKG, openpkg = 20020206, bash, sed
AutoReq: no
AutoReqProv: no
@@ -58,15 +60,23 @@
rm -rf $RPM_BUILD_ROOT
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/bin \
-$RPM_BUILD_ROOT%{l_prefix}/share/sgml
+$RPM_BUILD_ROOT%{l_prefix}/share/sgml \
+$RPM_BUILD_ROOT%{l_prefix}/libexec/sgml
%{l_shtool} install -c -m 644 \
/dev/null $RPM_BUILD_ROOT%{l_prefix}/share/sgml/catalog
%{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
[CVS] OpenPKG: openpkg-src/docbook/ docbook.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: 05-Jun-2003 16:57:35
Branch: HEAD Handle: 2003060515573401
Modified files:
openpkg-src/docbook docbook.spec
openpkg-web news.txt
Log:
use new sgml package to provide XML catalogs
Summary:
RevisionChanges Path
1.53+81 -16 openpkg-src/docbook/docbook.spec
1.4739 +1 -0 openpkg-web/news.txt
patch -p0 '@@ .'
Index: openpkg-src/docbook/docbook.spec
$ cvs diff -u -r1.52 -r1.53 docbook.spec
--- openpkg-src/docbook/docbook.spec 4 Jun 2003 09:04:07 - 1.52
+++ openpkg-src/docbook/docbook.spec 5 Jun 2003 14:57:35 - 1.53
@@ -43,7 +43,7 @@
Group:SGML
License: BSD
Version: 4.2
-Release: 20030604
+Release: 20030605
# list of sources
Source0:
http://www.oasis-open.org/docbook/xml/%{V_dtd_xml}/docbook-xml-%{V_dtd_xml}.zip
@@ -176,7 +176,7 @@
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
-'%not %dir %{l_prefix}/share/sgml'
+'%not %dir %attr(0644,-,-) %{l_prefix}/share/sgml'
%files -f files
@@ -185,23 +185,88 @@
%post
if [ $1 -eq 1 ]; then
-$RPM_INSTALL_PREFIX/bin/mkcatalog -q install iso8879-sgml
-$RPM_INSTALL_PREFIX/bin/mkcatalog -q install docbook-dtd-xml
-$RPM_INSTALL_PREFIX/bin/mkcatalog -q install docbook-dtd-xml-old
-$RPM_INSTALL_PREFIX/bin/mkcatalog -q install docbook-dtd-simple
-$RPM_INSTALL_PREFIX/bin/mkcatalog -q install docbook-dtd-sgml
-$RPM_INSTALL_PREFIX/bin/mkcatalog -q install docbook-dtd-sgml-old
-$RPM_INSTALL_PREFIX/bin/mkcatalog -q install docbook-ss-dsssl
+$RPM_INSTALL_PREFIX/bin/sgmlcatalog \
+-p ISO 8879:1986 \
+-s ISO 8879:1986//ENTITIES \
+-i iso8879-sgml \
+-p -//OASIS//DTD DocBook XML V4.1 \
+-p -//OASIS//ENTITIES DocBook XML V4.1 \
+-S http://www.oasis-open.org/docbook/xml/4.1; \
+-U http://www.oasis-open.org/docbook/xml/4.1; \
+-x \
+-i docbook-dtd-xml-old \
+-p -//OASIS//ELEMENTS DocBook XML Information Pool V4.2 \
+-p -//OASIS//DTD DocBook XML V4.2 \
+-p -//OASIS//ENTITIES DocBook XML Character Entities V4.2 \
+-p -//OASIS//ENTITIES DocBook XML Notations V4.2 \
+-p -//OASIS//ENTITIES DocBook XML Additional General Entities V4.2 \
+-p -//OASIS//ENTITIES DocBook XML Document Hierarchy V4.2 \
+-p -//OASIS//DTD XML Exchange Table Model 19990315 \
+-p -//OASIS//DTD DocBook XML CALS Table Model V4.2 \
+-p -//OASIS//ENTITIES DocBook XML \
+-p -//OASIS//DTD DocBook XML \
+-S http://www.oasis-open.org/docbook/xml/4.2; \
+-S http://www.oasis-open.org/docbook/; \
+-U http://www.oasis-open.org/docbook/xml/4.2; \
+-U http://www.oasis-open.org/docbook/; \
+-i docbook-dtd-xml \
+-p -//OASIS//DTD Simplified DocBook XML V1.0 \
+-p -//OASIS//DTD Simplified DocBook RefEntry XML V1.0 \
+-i docbook-dtd-simple \
+-p -//OASIS//DTD DocBook V4.1 \
+-i docbook-dtd-sgml-old \
+-p -//OASIS//DTD DocBook V4.2 \
+-p -//OASIS//DTD DocBook XML V4.2 \
+-i docbook-dtd-sgml \
+-p -//Norman Walsh//DOCUMENT DocBook \
+-p -//Norman Walsh//DOCUMENT DSSSL \
+-p -//Norman Walsh//DOCUMENT OLink \
+-p +//IDN nwalsh.com//DTD DocBook \
+-p -//Norman Walsh//DTD DocBook \
+-p -//Norman Walsh//DTD Image Library \
+-i docbook-ss-dsssl \
+-S http://docbook.sourceforge.net/release/xsl/current; \
+-S http://docbook.sourceforge.net/release/xsl/1.39; \
+-S http://docbook.sourceforge.net/release/xsl/1.40; \
+-S http://docbook.sourceforge.net/release/xsl/1.41; \
+-S http://docbook.sourceforge.net/release/xsl/1.42; \
+-S http://docbook.sourceforge.net/release/xsl/1.43; \
+-S http://docbook.sourceforge.net/release/xsl/1.44; \
+-S http://docbook.sourceforge.net/release/xsl/1.45; \
+-S http://docbook.sourceforge.net/release/xsl/1.46; \
+-S
[CVS] OpenPKG: openpkg-src/xmlto/ xmlto.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: 05-Jun-2003 17:00:54
Branch: HEAD Handle: 2003060516005102
Modified files:
openpkg-src/xmlto xmlto.spec
openpkg-web news.txt
Log:
promote to EVAL
Summary:
RevisionChanges Path
1.6 +2 -2 openpkg-src/xmlto/xmlto.spec
1.4740 +1 -0 openpkg-web/news.txt
patch -p0 '@@ .'
Index: openpkg-src/xmlto/xmlto.spec
$ cvs diff -u -r1.5 -r1.6 xmlto.spec
--- openpkg-src/xmlto/xmlto.spec 2 Jun 2003 13:53:57 - 1.5
+++ openpkg-src/xmlto/xmlto.spec 5 Jun 2003 15:00:53 - 1.6
@@ -29,11 +29,11 @@
URL: http://cyberelk.net/tim/xmlto/
Vendor: Tim Waugh
Packager: The OpenPKG Project
-Distribution: OpenPKG [JUNK]
+Distribution: OpenPKG [EVAL]
Group:SGML
License: GPL
Version: 0.0.14
-Release: 20030602
+Release: 20030605
# list of sources
Source0: http://cyberelk.net/tim/data/xmlto/stable/xmlto-%{version}.tar.bz2
@@ .
patch -p0 '@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.4739 -r1.4740 news.txt
--- openpkg-web/news.txt 5 Jun 2003 14:57:34 - 1.4739
+++ openpkg-web/news.txt 5 Jun 2003 15:00:51 - 1.4740
@@ -1,3 +1,4 @@
+05-Jun-2003: Upgraded package: Pxmlto-0.0.14-20030605
05-Jun-2003: Upgraded package: Pdocbook-4.2-20030605
05-Jun-2003: Upgraded package: Psgml-20030605-20030605
05-Jun-2003: Upgraded package: Papache-1.3.27-20030605
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/mysql4/ my.cnf mysql4.spec openpkg-web/ new...
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: 05-Jun-2003 17:24:27
Branch: HEAD Handle: 2003060516242501
Modified files:
openpkg-src/mysql4 my.cnf mysql4.spec
openpkg-web news.txt
Log:
move logfile configuration to proper section
Summary:
RevisionChanges Path
1.8 +8 -4 openpkg-src/mysql4/my.cnf
1.16+1 -1 openpkg-src/mysql4/mysql4.spec
1.4741 +1 -0 openpkg-web/news.txt
patch -p0 '@@ .'
Index: openpkg-src/mysql4/my.cnf
$ cvs diff -u -r1.7 -r1.8 my.cnf
--- openpkg-src/mysql4/my.cnf 5 May 2003 13:48:08 - 1.7
+++ openpkg-src/mysql4/my.cnf 5 Jun 2003 15:24:26 - 1.8
@@ -9,6 +9,14 @@
[mysqld]
bind-address = 127.0.0.1
port = 3306
+# logfile destinations (overwrite values of rc.mysql4 in rc.conf accordingly)
+log = @l_prefix@/var/mysql4/common.log
+log-update = @l_prefix@/var/mysql4/update.log
+# binary log
+# use instead of log-update, server-id must be unique for replication
+#log-bin = @l_prefix@/var/mysql4/binary.log
+#server-id= 1
+
[mysqld_safe]
datadir = @l_prefix@/var/mysql4
@@ -16,10 +24,6 @@
set-variable = [EMAIL PROTECTED]@/var/mysql4/mysqld.pid
user = @l_rusr@
basedir = @l_prefix@
-
-# logfile destinations (overwrite values of rc.mysql4 in rc.conf accordingly)
-log = @l_prefix@/var/mysql4/common.log
-log-update = @l_prefix@/var/mysql4/update.log
# most important tuning parameters for mysqld
set-variable = key_buffer_size=16M
@@ .
patch -p0 '@@ .'
Index: openpkg-src/mysql4/mysql4.spec
$ cvs diff -u -r1.15 -r1.16 mysql4.spec
--- openpkg-src/mysql4/mysql4.spec21 May 2003 13:40:12 - 1.15
+++ openpkg-src/mysql4/mysql4.spec5 Jun 2003 15:24:26 - 1.16
@@ -39,7 +39,7 @@
Group:Database
License: GPL
Version: %{V_opkg}
-Release: 20030521
+Release: 20030605
# package options
%option with_berkeleydb yes
@@ .
patch -p0 '@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.4740 -r1.4741 news.txt
--- openpkg-web/news.txt 5 Jun 2003 15:00:51 - 1.4740
+++ openpkg-web/news.txt 5 Jun 2003 15:24:25 - 1.4741
@@ -1,3 +1,4 @@
+05-Jun-2003: Upgraded package: Pmysql4-4.0.13-20030605
05-Jun-2003: Upgraded package: Pxmlto-0.0.14-20030605
05-Jun-2003: Upgraded package: Pdocbook-4.2-20030605
05-Jun-2003: Upgraded package: Psgml-20030605-20030605
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/instant/ instant.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: 05-Jun-2003 17:59:01
Branch: HEAD Handle: 2003060516590001
Modified files:
openpkg-src/instant instant.spec
openpkg-web news.txt
Log:
adapt for new SGML catalogs
Summary:
RevisionChanges Path
1.22+7 -3 openpkg-src/instant/instant.spec
1.4742 +1 -0 openpkg-web/news.txt
patch -p0 '@@ .'
Index: openpkg-src/instant/instant.spec
$ cvs diff -u -r1.21 -r1.22 instant.spec
--- openpkg-src/instant/instant.spec 3 Jan 2003 10:52:36 - 1.21
+++ openpkg-src/instant/instant.spec 5 Jun 2003 15:59:01 - 1.22
@@ -33,7 +33,7 @@
Group:SGML
License: BSD
Version: 1.0
-Release: 20020315
+Release: 20030605
# list of sources
Source0: instant-%{version}.tar.gz
@@ -87,11 +87,15 @@
%post
if [ $1 -eq 1 ]; then
-$RPM_INSTALL_PREFIX/bin/mkcatalog -q install transpec
+$RPM_INSTALL_PREFIX/bin/sgmlcatalog \
+-p -//OSF//DTD transpec \
+-x \
+-i transpec
fi
%preun
if [ $1 -eq 0 ]; then
-$RPM_INSTALL_PREFIX/bin/mkcatalog -q deinstall transpec
+$RPM_INSTALL_PREFIX/bin/sgmlcatalog \
+-d transpec
fi
@@ .
patch -p0 '@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.4741 -r1.4742 news.txt
--- openpkg-web/news.txt 5 Jun 2003 15:24:25 - 1.4741
+++ openpkg-web/news.txt 5 Jun 2003 15:59:00 - 1.4742
@@ -1,3 +1,4 @@
+05-Jun-2003: Upgraded package: Pinstant-1.0-20030605
05-Jun-2003: Upgraded package: Pmysql4-4.0.13-20030605
05-Jun-2003: Upgraded package: Pxmlto-0.0.14-20030605
05-Jun-2003: Upgraded package: Pdocbook-4.2-20030605
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/sgmlfmt/ sgmlfmt.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: 05-Jun-2003 18:00:21
Branch: HEAD Handle: 2003060517001703
Modified files:
openpkg-src/sgmlfmt sgmlfmt.spec
openpkg-web news.txt
Log:
drop SGML catalog support, catalogs are maintained in the separated
instant package
Summary:
RevisionChanges Path
1.22+2 -12 openpkg-src/sgmlfmt/sgmlfmt.spec
1.4743 +1 -0 openpkg-web/news.txt
patch -p0 '@@ .'
Index: openpkg-src/sgmlfmt/sgmlfmt.spec
$ cvs diff -u -r1.21 -r1.22 sgmlfmt.spec
--- openpkg-src/sgmlfmt/sgmlfmt.spec 3 Jan 2003 10:54:50 - 1.21
+++ openpkg-src/sgmlfmt/sgmlfmt.spec 5 Jun 2003 16:00:20 - 1.22
@@ -33,7 +33,7 @@
Group:SGML
License: BSD
Version: 1.7
-Release: 20020206
+Release: 20030605
# list of sources
Source0: sgmlfmt-%{version}.tar.gz
@@ -42,7 +42,7 @@
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
BuildPreReq: OpenPKG, openpkg = 20020206
-PreReq: OpenPKG, openpkg = 20020206, perl, sgml, openjade, instant, groff
+PreReq: OpenPKG, openpkg = 20020206, perl, openjade, instant, groff
AutoReq: no
AutoReqProv: no
@@ -75,14 +75,4 @@
%clean
rm -rf $RPM_BUILD_ROOT
-
-%post
-if [ $1 -eq 1 ]; then
-$RPM_INSTALL_PREFIX/bin/mkcatalog -q install transpec
-fi
-
-%preun
-if [ $1 -eq 0 ]; then
-$RPM_INSTALL_PREFIX/bin/mkcatalog -q deinstall transpec
-fi
@@ .
patch -p0 '@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.4742 -r1.4743 news.txt
--- openpkg-web/news.txt 5 Jun 2003 15:59:00 - 1.4742
+++ openpkg-web/news.txt 5 Jun 2003 16:00:17 - 1.4743
@@ -1,3 +1,4 @@
+05-Jun-2003: Upgraded package: Psgmlfmt-1.7-20030605
05-Jun-2003: Upgraded package: Pinstant-1.0-20030605
05-Jun-2003: Upgraded package: Pmysql4-4.0.13-20030605
05-Jun-2003: Upgraded package: Pxmlto-0.0.14-20030605
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[OpenPKG] Version Tracking Report (2003-06-05 19:31)
OpenPKG Version Tracking Report === Reporting Time:2003-06-05 19:31 Tracking Duration: 0:31:08 (H:M:S) Tracking Input:800 sources (527 packages) Tracking Result: 781 up-to-date, 3 out-dated, 16 error The following 3 sources were determined to be out-dated because newer vendor versions were found. Upgrade the corresponding OpenPKG packages. - - - Package Old Version New Version - - - patchutils0.2.220.2.23 uvscan:datfiles 4269 4270 vim:patchlevel6.2.013 6.2.014 - - - The following 16 sources could not be successfully checked because an error occurred while processing. Keep at least an eye on them. - - - Package Old Version Error - - - apache:mod_roaming1.0.2 connection failed or ti.. gdk-pixbuf0.22.02nd connection failed o.. ghostscript:jpegsrc v6b connection failed or ti.. jpegsrc v6b connection failed or ti.. libart2.3.122nd connection failed o.. mozilla 1.3.1 1st connection failed o.. pdksh 5.2.14connection failed or [1] perl-net:Net-Services 1.3 regex didn't match (p [2] postgresql7.3.3 1st connection failed o.. postgresql:libpq++4.0 connection failed or ti.. postgresql:libpqxx1.5.1 connection failed or ti.. postgresql:pgperl 2.0.2 connection failed or ti.. postgresql:psqlodbc 07.03.0100connection failed or ti.. rdist 7.0.0-alpha10 connection failed or ti.. skey 1.1.5 regex didn't match (pro.. smtpfeed 1.18 connection failed or [3] - - - [1] pdksh: thl: ftp server refuses connections. maintainer notified. [2] perl-net:Net-Services: rse: seems it has been disappeared from CPAN [3] smtpfeed: thl: master site down and only known mirror is netsw! The remaining 781 sources were successfully determined to be still up to date. No action is required on your part. Just be happy ;) OpenPKG Version Tracker [EMAIL PROTECTED] __ The OpenPKG Projectwww.openpkg.org Developer Communication List [EMAIL PROTECTED]
Re: [CVS] OpenPKG: openpkg-src/docbook/ docbook.spec openpkg-web/ news.txt
On Thu, Jun 05, 2003, Michael van Elst wrote:
[...]
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
-'%not %dir %{l_prefix}/share/sgml'
+'%not %dir %attr(0644,-,-) %{l_prefix}/share/sgml'
[...]
What does this achieve? The %not just ignore the directory, so
why do you set attributes for it? And why 0644, its a directory!?
Ralf S. Engelschall
[EMAIL PROTECTED]
www.engelschall.com
__
The OpenPKG Projectwww.openpkg.org
Developer Communication List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/vcheck/ vc.patchutils openpkg-src/patchutils...
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 openpkg$ Date: 05-Jun-2003 19:53:06
Branch: HEAD Handle: 2003060518530402
Modified files:
openpkg-re/vcheck vc.patchutils
openpkg-src/patchutils patchutils.spec
openpkg-web news.txt
Log:
upgrading package: patchutils 0.2.22 - 0.2.23
Summary:
RevisionChanges Path
1.15+1 -1 openpkg-re/vcheck/vc.patchutils
1.28+2 -2 openpkg-src/patchutils/patchutils.spec
1.4744 +1 -0 openpkg-web/news.txt
patch -p0 '@@ .'
Index: openpkg-re/vcheck/vc.patchutils
$ cvs diff -u -r1.14 -r1.15 vc.patchutils
--- openpkg-re/vcheck/vc.patchutils 9 Mar 2003 07:55:20 - 1.14
+++ openpkg-re/vcheck/vc.patchutils 5 Jun 2003 17:53:04 - 1.15
@@ -2,7 +2,7 @@
}
prog patchutils = {
- version = 0.2.22
+ version = 0.2.23
url = http://cyberelk.net/tim/data/patchutils/stable/
regex = patchutils-(\d+\.\d+\.\d+)\.tar\.bz2
}
@@ .
patch -p0 '@@ .'
Index: openpkg-src/patchutils/patchutils.spec
$ cvs diff -u -r1.27 -r1.28 patchutils.spec
--- openpkg-src/patchutils/patchutils.spec9 Mar 2003 07:55:24 - 1.27
+++ openpkg-src/patchutils/patchutils.spec5 Jun 2003 17:53:06 - 1.28
@@ -32,8 +32,8 @@
Distribution: OpenPKG [PLUS]
Group:Converter
License: GPL
-Version: 0.2.22
-Release: 20030309
+Version: 0.2.23
+Release: 20030605
# list of sources
Source0:
http://cyberelk.net/tim/data/patchutils/stable/patchutils-%{version}.tar.bz2
@@ .
patch -p0 '@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.4743 -r1.4744 news.txt
--- openpkg-web/news.txt 5 Jun 2003 16:00:17 - 1.4743
+++ openpkg-web/news.txt 5 Jun 2003 17:53:04 - 1.4744
@@ -1,3 +1,4 @@
+05-Jun-2003: Upgraded package: Ppatchutils-0.2.23-20030605
05-Jun-2003: Upgraded package: Psgmlfmt-1.7-20030605
05-Jun-2003: Upgraded package: Pinstant-1.0-20030605
05-Jun-2003: Upgraded package: Pmysql4-4.0.13-20030605
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/vcheck/ vc.uvscan openpkg-src/uvscan/ uvscan...
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 openpkg$ Date: 05-Jun-2003 19:59:44
Branch: HEAD Handle: 2003060518594202
Modified files:
openpkg-re/vcheck vc.uvscan
openpkg-src/uvscan uvscan.spec
openpkg-web news.txt
Log:
upgrading package: uvscan 4.1.6.4269 - 4.1.6.4270
Summary:
RevisionChanges Path
1.78+1 -1 openpkg-re/vcheck/vc.uvscan
1.88+1 -1 openpkg-src/uvscan/uvscan.spec
1.4745 +1 -0 openpkg-web/news.txt
patch -p0 '@@ .'
Index: openpkg-re/vcheck/vc.uvscan
$ cvs diff -u -r1.77 -r1.78 vc.uvscan
--- openpkg-re/vcheck/vc.uvscan 5 Jun 2003 08:20:46 - 1.77
+++ openpkg-re/vcheck/vc.uvscan 5 Jun 2003 17:59:42 - 1.78
@@ -2,7 +2,7 @@
}
prog uvscan:datfiles = {
- version = 4269
+ version = 4270
url = ftp://ftp.nai.com/pub/antivirus/datfiles/4.x/
regex = dat-(\d+).tar
}
@@ .
patch -p0 '@@ .'
Index: openpkg-src/uvscan/uvscan.spec
$ cvs diff -u -r1.87 -r1.88 uvscan.spec
--- openpkg-src/uvscan/uvscan.spec5 Jun 2003 08:20:48 - 1.87
+++ openpkg-src/uvscan/uvscan.spec5 Jun 2003 17:59:44 - 1.88
@@ -27,7 +27,7 @@
%define V_engine 4.1.6
%define V_engine_dist1 4.16
%define V_engine_dist2 416
-%define V_datfiles 4269
+%define V_datfiles 4270
# package information
Name: uvscan
@@ .
patch -p0 '@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.4744 -r1.4745 news.txt
--- openpkg-web/news.txt 5 Jun 2003 17:53:04 - 1.4744
+++ openpkg-web/news.txt 5 Jun 2003 17:59:43 - 1.4745
@@ -1,3 +1,4 @@
+05-Jun-2003: Upgraded package: Puvscan-4.1.6.4270-20030605
05-Jun-2003: Upgraded package: Ppatchutils-0.2.23-20030605
05-Jun-2003: Upgraded package: Psgmlfmt-1.7-20030605
05-Jun-2003: Upgraded package: Pinstant-1.0-20030605
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
Re: [CVS] OpenPKG: openpkg-src/docbook/ docbook.spec openpkg-web/ news.txt
On Thu, Jun 05, 2003, Ralf S. Engelschall wrote:
On Thu, Jun 05, 2003, Michael van Elst wrote:
[...]
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
-'%not %dir %{l_prefix}/share/sgml'
+'%not %dir %attr(0644,-,-) %{l_prefix}/share/sgml'
[...]
What does this achieve? The %not just ignore the directory, so
why do you set attributes for it? And why 0644, its a directory!?
It ought to set the permissions of all files (where many are mode
664 or 640), but apparently it is non-sense :)
--
,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]
[BugDB] Hi there (PR#181)
--=_NextPart_30932_9832_5CCD.6FC9780215A5 Content-Type: text/html; charset=us-ascii Content-Transfer-Encoding: 8bit html head titleUntitled Document/title meta http-equiv=Content-Type content=text/html; charset=iso-8859-1 /head body bgcolor=#FF text=#00 pCopy DVD Software for only $19.95a href=http://www.copydvd.net; See here for more information/a/p pIt can also CONVERT VHS INTO DVD! /p pa href=http://www.copydvd.net;See here for more information/a/p pnbsp;/p pnbsp;/p pnbsp;/p pnbsp;/p pnbsp;/p pnbsp;/p pIf you don't want more emails from us please e-mail :/p p[EMAIL PROTECTED]/p pnbsp;/p p11314 Ventura Blvd Suite #141 /p pStudio City, CA 91604 /p p Phone (213) 216 8305 br /p pnbsp; /p /body /html --=_NextPart_30932_9832_5CCD.6FC9780215A5-- __ The OpenPKG Projectwww.openpkg.org Developer Communication List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/vcheck/ vc.multitail openpkg-src/multitail/ ...
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 openpkg$ Date: 06-Jun-2003 09:28:00
Branch: HEAD Handle: 2003060608275702
Modified files:
openpkg-re/vcheck vc.multitail
openpkg-src/multitail multitail.spec
openpkg-web news.txt
Log:
upgrading package: multitail 2.7.1 - 2.7.2
Summary:
RevisionChanges Path
1.24+1 -1 openpkg-re/vcheck/vc.multitail
1.20+3 -3 openpkg-src/multitail/multitail.spec
1.4747 +1 -0 openpkg-web/news.txt
patch -p0 '@@ .'
Index: openpkg-re/vcheck/vc.multitail
$ cvs diff -u -r1.23 -r1.24 vc.multitail
--- openpkg-re/vcheck/vc.multitail2 Jun 2003 07:27:43 - 1.23
+++ openpkg-re/vcheck/vc.multitail6 Jun 2003 07:27:57 - 1.24
@@ -2,7 +2,7 @@
}
prog multitail = {
- version = 2.7.1
+ version = 2.7.2
url = http://www.vanheusden.com/multitail/download.html
regex = multitail-(__VER__)\.tgz
}
@@ .
patch -p0 '@@ .'
Index: openpkg-src/multitail/multitail.spec
$ cvs diff -u -r1.19 -r1.20 multitail.spec
--- openpkg-src/multitail/multitail.spec 2 Jun 2003 07:27:46 - 1.19
+++ openpkg-src/multitail/multitail.spec 6 Jun 2003 07:27:59 - 1.20
@@ -32,8 +32,8 @@
Distribution: OpenPKG [EVAL]
Group:Terminal
License: GPL
-Version: 2.7.1
-Release: 20030602
+Version: 2.7.2
+Release: 20030606
# list of sources
Source0: http://www.vanheusden.com/multitail/multitail-%{version}.tgz
@@ -55,7 +55,7 @@
through slow links.
%prep
-%setup -q -n multitail-2.7
+%setup -q
%build
libs=-lncurses
@@ .
patch -p0 '@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.4746 -r1.4747 news.txt
--- openpkg-web/news.txt 5 Jun 2003 18:00:12 - 1.4746
+++ openpkg-web/news.txt 6 Jun 2003 07:27:58 - 1.4747
@@ -1,3 +1,4 @@
+06-Jun-2003: Upgraded package: Pmultitail-2.7.2-20030606
05-Jun-2003: Upgraded package: Pvim-6.2.14-20030605
05-Jun-2003: Upgraded package: Puvscan-4.1.6.4270-20030605
05-Jun-2003: Upgraded package: Ppatchutils-0.2.23-20030605
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/vcheck/ vc.rt openpkg-src/rt/ rt.spec openpk...
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 openpkg$ Date: 06-Jun-2003 09:30:41
Branch: HEAD Handle: 2003060608303802
Modified files:
openpkg-re/vcheck vc.rt
openpkg-src/rt rt.spec
openpkg-web news.txt
Log:
modifying package: rt-3.0.2 20030605 - 20030606
Summary:
RevisionChanges Path
1.29+1 -1 openpkg-re/vcheck/vc.rt
1.64+2 -2 openpkg-src/rt/rt.spec
1.4748 +1 -0 openpkg-web/news.txt
patch -p0 '@@ .'
Index: openpkg-re/vcheck/vc.rt
$ cvs diff -u -r1.28 -r1.29 vc.rt
--- openpkg-re/vcheck/vc.rt 5 Jun 2003 05:59:16 - 1.28
+++ openpkg-re/vcheck/vc.rt 6 Jun 2003 07:30:38 - 1.29
@@ -55,7 +55,7 @@
regex = Test-Inline-(__VER__).tar.gz
}
prog rt:www-mechanize = {
- version = 0.43
+ version = 0.44
url = http://www.cpan.org/modules/by-authors/id/P/PE/PETDANCE/
regex = WWW-Mechanize-(__VER__).tar.g
}
@@ .
patch -p0 '@@ .'
Index: openpkg-src/rt/rt.spec
$ cvs diff -u -r1.63 -r1.64 rt.spec
--- openpkg-src/rt/rt.spec5 Jun 2003 05:59:18 - 1.63
+++ openpkg-src/rt/rt.spec6 Jun 2003 07:30:40 - 1.64
@@ -31,7 +31,7 @@
%define V_log_dispatch 2.04
%define V_html_mason 1.21
%define V_libapreq 1.1
-%define V_www_mechanize 0.43
+%define V_www_mechanize 0.44
%define V_mldbm 2.01
%define V_html_format2.03
%define V_test_inline0.15
@@ -49,7 +49,7 @@
Group:Database
License: GPL
Version: %{V_here}
-Release: 20030605
+Release: 20030606
# package options
%option with_color_primary 336699
@@ .
patch -p0 '@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.4747 -r1.4748 news.txt
--- openpkg-web/news.txt 6 Jun 2003 07:27:58 - 1.4747
+++ openpkg-web/news.txt 6 Jun 2003 07:30:39 - 1.4748
@@ -1,3 +1,4 @@
+06-Jun-2003: Upgraded package: Prt-3.0.2-20030606
06-Jun-2003: Upgraded package: Pmultitail-2.7.2-20030606
05-Jun-2003: Upgraded package: Pvim-6.2.14-20030605
05-Jun-2003: Upgraded package: Puvscan-4.1.6.4270-20030605
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/vcheck/ vc.perl-xml openpkg-src/perl-xml/ pe...
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 openpkg$ Date: 06-Jun-2003 10:06:11
Branch: HEAD Handle: 2003060609060802
Modified files:
openpkg-re/vcheck vc.perl-xml
openpkg-src/perl-xmlperl-xml.spec
openpkg-web news.txt
Log:
upgrading package: perl-xml 20030531 - 20030606
Summary:
RevisionChanges Path
1.49+10 -0 openpkg-re/vcheck/vc.perl-xml
1.69+22 -12 openpkg-src/perl-xml/perl-xml.spec
1.4749 +1 -0 openpkg-web/news.txt
patch -p0 '@@ .'
Index: openpkg-re/vcheck/vc.perl-xml
$ cvs diff -u -r1.48 -r1.49 vc.perl-xml
--- openpkg-re/vcheck/vc.perl-xml 31 May 2003 10:36:47 - 1.48
+++ openpkg-re/vcheck/vc.perl-xml 6 Jun 2003 08:06:08 - 1.49
@@ -6,6 +6,16 @@
url = http://www.cpan.org/modules/by-module/HTML/
regex = HTML-Parser-(__VER__)\.tar\.gz
}
+prog perl-xml:HTML-Table = {
+ version = 1.18a
+ url = http://www.cpan.org/modules/by-module/HTML/
+ regex = HTML-Table-(__VER__)\.tar\.gz
+}
+prog perl-xml:HTML-TagReader = {
+ version = 1.00
+ url = http://www.cpan.org/modules/by-module/HTML/
+ regex = HTML-TagReader-(__VER__)\.tar\.gz
+}
prog perl-xml:HTML-Tagset = {
version = 3.03
url = http://www.cpan.org/modules/by-module/HTML/
@@ .
patch -p0 '@@ .'
Index: openpkg-src/perl-xml/perl-xml.spec
$ cvs diff -u -r1.68 -r1.69 perl-xml.spec
--- openpkg-src/perl-xml/perl-xml.spec31 May 2003 10:36:50 - 1.68
+++ openpkg-src/perl-xml/perl-xml.spec6 Jun 2003 08:06:10 - 1.69
@@ -47,6 +47,8 @@
%define V_html_tagset 3.03
%define V_html_parser 3.28
%define V_html_tree3.17
+%define V_html_table 1.18a
+%define V_html_tagreader 1.00
%define V_xml_xsh 1.6
%define V_xml_gdome0.82
%define V_xml_libxml_perl 0.07
@@ -60,8 +62,8 @@
Distribution: OpenPKG [BASE]
Group:Language
License: GPL/Artistic
-Version: 20030531
-Release: 20030531
+Version: 20030606
+Release: 20030606
# package options
%option with_libxmlno
@@ -100,11 +102,13 @@
Source18:
http://www.cpan.org/modules/by-module/HTML/HTML-Tagset-%{V_html_tagset}.tar.gz
Source19:
http://www.cpan.org/modules/by-module/HTML/HTML-Parser-%{V_html_parser}.tar.gz
Source20:
http://www.cpan.org/modules/by-module/HTML/HTML-Tree-%{V_html_tree}.tar.gz
-Source21:
http://www.cpan.org/authors/id/P/PH/PHISH/XML-LibXML-Common-%{V_xml_libxml_common}.tar.gz
-Source22:
http://www.cpan.org/authors/id/P/PH/PHISH/XML-LibXML-%{V_xml_libxml}.tar.gz
-Source23:
http://osdn.dl.sourceforge.net/sourceforge/xsh/XML-XSH-%{V_xml_xsh}.tar.gz
-Source24:
http://www.cpan.org/authors/id/M/MS/MSERGEANT/XML-LibXSLT-%{V_xml_libxslt}.tar.gz
-Source25:
http://www.cpan.org/modules/by-module/XML/XML-GDOME-%{V_xml_gdome}.tar.gz
+Source21:
http://www.cpan.org/modules/by-module/HTML/HTML-Table-%{V_html_table}.tar.gz
+Source22:
http://www.cpan.org/modules/by-module/HTML/HTML-TagReader-%{V_html_tagreader}.tar.gz
+Source23:
http://www.cpan.org/authors/id/P/PH/PHISH/XML-LibXML-Common-%{V_xml_libxml_common}.tar.gz
+Source24:
http://www.cpan.org/authors/id/P/PH/PHISH/XML-LibXML-%{V_xml_libxml}.tar.gz
+Source25:
http://osdn.dl.sourceforge.net/sourceforge/xsh/XML-XSH-%{V_xml_xsh}.tar.gz
+Source26:
http://www.cpan.org/authors/id/M/MS/MSERGEANT/XML-LibXSLT-%{V_xml_libxslt}.tar.gz
+Source27:
http://www.cpan.org/modules/by-module/XML/XML-GDOME-%{V_xml_gdome}.tar.gz
# build information
Prefix: %{l_prefix}
@@ -156,6 +160,8 @@
- HTML::Tagset (%{V_html_tagset})
- HTML::Parser (%{V_html_parser})
- HTML::Tree (%{V_html_tree})
+- HTML::Table (%{V_html_table})
+- HTML::TagReader (%{V_html_tagreader})
%prep
%setup0 -q -c
@@ -184,6 +190,8 @@
%setup23 -q -T -D -a 23
%setup24 -q -T -D -a 24
%setup25 -q -T -D -a 25
+%setup26 -q -T -D -a 26
+%setup27 -q -T -D -a 27
%build
@@ -214,16 +222,18 @@
%{l_prefix}/bin/perl-openpkg install -d %{SOURCE18}
%{l_prefix}/bin/perl-openpkg install -d %{SOURCE19
[CVS] OpenPKG: openpkg-src/dss/ dss.patch dss.spec rc.dss openpkg-web/...
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: 06-Jun-2003 10:15:44
Branch: HEAD Handle: 2003060609154201
Modified files:
openpkg-src/dss dss.patch dss.spec rc.dss
openpkg-web news.txt
Log:
Bring adminserver to life, but still missing text strings
Summary:
RevisionChanges Path
1.3 +12 -0 openpkg-src/dss/dss.patch
1.14+30 -9 openpkg-src/dss/dss.spec
1.3 +26 -12 openpkg-src/dss/rc.dss
1.4750 +1 -0 openpkg-web/news.txt
patch -p0 '@@ .'
Index: openpkg-src/dss/dss.patch
$ cvs diff -u -r1.2 -r1.3 dss.patch
--- openpkg-src/dss/dss.patch 2 Jun 2003 16:01:53 - 1.2
+++ openpkg-src/dss/dss.patch 6 Jun 2003 08:15:43 - 1.3
@@ -120,3 +120,15 @@
+# require group broadcaster
+#/Limit
+diff -Naur DSS-4_1_3.src.orig/WebAdmin/WebAdminHtml/cgi-lib.pl
DSS-4_1_3.src/WebAdmin/WebAdminHtml/cgi-lib.pl
+--- DSS-4_1_3.src.orig/WebAdmin/WebAdminHtml/cgi-lib.pl Sat Feb 22 00:42:24
2003
DSS-4_1_3.src/WebAdmin/WebAdminHtml/cgi-lib.pl Thu Jun 5 18:13:26 2003
+@@ -51,7 +51,7 @@
+ $charsetstr = ';charset=Shift_JIS';
+ }
+
+-my $headerstr = HTTP/1.0 200 OK\r\nDate: $datestr\r\nServer:
$_[0]\r\nContent-Type: text/html$charsetstr\r\nConnection:close\r\n;
++my $headerstr = HTTP/1.0 200 OK\r\nDate: $datestr\r\nServer:
$_[0]\r\nContent-Type: text/html$charsetstr\r\n\r\nConnection:close\r\n;
+ if ($_[1] eq ) {
+ $headerstr .= \r\n
+ }
@@ .
patch -p0 '@@ .'
Index: openpkg-src/dss/dss.spec
$ cvs diff -u -r1.13 -r1.14 dss.spec
--- openpkg-src/dss/dss.spec 5 Jun 2003 06:53:41 - 1.13
+++ openpkg-src/dss/dss.spec 6 Jun 2003 08:15:43 - 1.14
@@ -37,7 +37,7 @@
Group:Video
License: APSL
Version: %{V_opkg}
-Release: 20030605
+Release: 20030606
# list of sources
Source0:
http://www.opensource.apple.com/projects/streaming/source/DSS-%{V_dss}.src.tar.gz
@@ -64,8 +64,9 @@
%patch -p1
l_hostname=`%{l_shtool} echo -e %h%d`
%{l_shtool} subst \
--e 's;/etc/streaming/;%{l_prefix}/etc/dss/;' \
--e 's;/etc/\(streaming.*server.conf\);%{l_prefix}/etc/dss/\1;' \
+-e 's;/etc/streaming/;%{l_prefix}/etc/dss/;g' \
+-e 's;/etc/streamingserver.xml;%{l_prefix}/etc/dss/streamingserver.xml;g' \
+-e
's;/etc/streamingadminserver.conf;%{l_prefix}/etc/dss/streamingadmin.conf;g' \
APIModules/QTSSAccessModule/QTSSAccessModule.cpp \
APIModules/QTSSDemoAuthorizationModule.bproj/QTSSDemoModule.cpp \
APIModules/QTSSReflectorModule/QTSSRelayModule.cpp \
@@ -75,10 +76,19 @@
WebAdmin/src/streamingadminserver.pl \
WebAdmin/streamingadminserver_Darwin.conf
%{l_shtool} subst \
--e 's;/var/streaming/AdminHtml;%{l_prefix}/var/dss/webadmin;' \
+-e 's;/var/streaming/AdminHtml;%{l_prefix}/var/dss/webadmin;g' \
+-e 's;/usr/local/bin/qtpasswd;%{l_prefix}/bin/qtpasswd;g' \
+-e
's;/usr/local/bin/PlaylistBroadcaster;%{l_prefix}/bin/PlaylistBroadcaster;g' \
+-e 's;/usr/local/bin/MP3Broadcaster;%{l_prefix}/bin/MP3Broadcaster;g' \
+-e 's;/var/streaming/playlists/;share/dss/playlists;g' \
+-e 's;realm, DSS Admin Server;realm, Streaming Admin Server;g' \
+-e 's;qtssAdmin, streamingadmin;qtssAdmin, dssadmin;g' \
+-e 's;#pidfile, /var/streaming/streamingadminserver.pid;pidfile,
%{l_prefix}/var/dss/dssadmin.pid;g' \
+-e
's;/usr/local/sbin/DarwinStreamingServer;%{l_prefix}/sbin/DarwinStreamingServer -c
%{l_prefix}/etc/dss/streamingadmin.conf;g' \
+-e
's;/var/streaming/logs/streamingadminserver.log;%{l_prefix}/var/dss/logs/StreamingAdmin.log;g'
\
WebAdmin/src/streamingadminserver.pl
%{l_shtool} subst \
--e 's;/etc/streaming/qtusers;%{l_prefix}/etc/dss/qtusers;' \
+-e 's;/etc/streaming/qtusers;%{l_prefix}/etc/dss/qtusers;g' \
qtpasswd.tproj/QTSSPasswd.cpp
%{l_shtool} subst \
-e 's;[ \t]$;;g' \
@@ -97,15 +107,24 @@
-e
's;/Library/QuickTimeStreaming/Config/qtusers;%{l_prefix}/etc/dss/qtusers;g' \
streamingserver.xml
%{l_shtool} subst \
+-e 's;qtssAutoStart=1;qtssAutoStart=0;g' \
-e s
[CVS] OpenPKG: openpkg-re/vcheck/ vc.bind openpkg-src/bind/ bind.spec ...
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 openpkg$ Date: 06-Jun-2003 11:20:27
Branch: HEAD Handle: 2003060610202402
Modified files:
openpkg-re/vcheck vc.bind
openpkg-src/bindbind.spec
openpkg-web news.txt
Log:
upgrade DLZ 0.40 - 0.50 with ODBC support, fix dlz_postgres linking
Summary:
RevisionChanges Path
1.11+1 -1 openpkg-re/vcheck/vc.bind
1.54+16 -11 openpkg-src/bind/bind.spec
1.4751 +1 -0 openpkg-web/news.txt
patch -p0 '@@ .'
Index: openpkg-re/vcheck/vc.bind
$ cvs diff -u -r1.10 -r1.11 vc.bind
--- openpkg-re/vcheck/vc.bind 3 May 2003 18:13:23 - 1.10
+++ openpkg-re/vcheck/vc.bind 6 Jun 2003 09:20:24 - 1.11
@@ -10,7 +10,7 @@
regex = bind-(__VER__)\.tar\.gz
}
prog bind:DLZ = {
- version = 0.4.3
+ version = 0.5.0
url = http://osdn.dl.sourceforge.net/bind-dlz/
regex = DLZ-(__VER__)\.tar\.gz
}
@@ .
patch -p0 '@@ .'
Index: openpkg-src/bind/bind.spec
$ cvs diff -u -r1.53 -r1.54 bind.spec
--- openpkg-src/bind/bind.spec3 May 2003 18:13:27 - 1.53
+++ openpkg-src/bind/bind.spec6 Jun 2003 09:20:26 - 1.54
@@ -25,7 +25,7 @@
# package versions
%define V_bind 9.2.2
-%define V_dlz 0.4.3
+%define V_dlz 0.5.0
# package information
Name: bind
@@ -37,7 +37,7 @@
Group:DNS
License: ISC
Version: %{V_bind}
-Release: 20030503
+Release: 20030606
# package options
%option with_dlz_mysql no
@@ -45,9 +45,10 @@
%option with_dlz_filesystem no
%option with_dlz_stub no
%option with_dlz_bdbno
+%option with_dlz_odbc no
# aggregate option
-%if %{with_dlz_mysql} == yes || %{with_dlz_postgres} == yes ||
%{with_dlz_filesystem} == yes || %{with_dlz_stub} == yes || %{with_dlz_bdb}
== yes
+%if %{with_dlz_mysql} == yes || %{with_dlz_postgres} == yes ||
%{with_dlz_filesystem} == yes || %{with_dlz_stub} == yes || %{with_dlz_bdb}
== yes || %{with_dlz_odbc} == yes
%define with_dlzyes
%else
%define with_dlzno
@@ -82,6 +83,10 @@
BuildPreReq: db
PreReq: db
%endif
+%if %{with_dlz_odbc} == yes
+BuildPreReq: unixodbc
+PreReq: unixodbc
+%endif
AutoReq: no
AutoReqProv: no
Conflicts:bind8
@@ -96,26 +101,21 @@
%prep
%setup -q
%if %{with_dlz} == yes
-echo WITH DLZ
%setup -q -T -D -a 10
#
%{l_patch} -p1 dlz.patch
#
-# fix up DLZ link libraries for MYSQL
+# fix up DLZ link libraries for MYSQL and Postgres
%{l_shtool} subst \
-e '/-lmysqlclient/s;-l\(nsl\|z\|crypt\|m\)\( \|\);\2;g' \
+-e 's;\(-lpq\);\1 -lssl -lcrypto;g' \
configure
%endif
-%if %{with_dlz_bdb} != yes
-# dlzbdb still doesn't link if not enabled
-%{l_shtool} subst \
--e 's;dlzbdb *;;g' \
-bin/Makefile.in
-%endif
%build
cf=
lf=
+li=
%if %{with_dlz_mysql} == yes
cf=`mysql_config --cflags`
cf=`eval echo $cf`
@@ -153,6 +153,11 @@
--with-dlz-stub=yes \
%else
--with-dlz-stub=no \
+%endif
+%if %{with_dlz_odbc} == yes
+--with-dlz-odbc=%{l_prefix} \
+%else
+--with-dlz-odbc=no \
%endif
--with-openssl=%{l_prefix} \
--with-libtool \
@@ .
patch -p0 '@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.4750 -r1.4751 news.txt
--- openpkg-web/news.txt 6 Jun 2003 08:15:42 - 1.4750
+++ openpkg-web/news.txt 6 Jun 2003 09:20:25 - 1.4751
@@ -1,3 +1,4 @@
+06-Jun-2003: Upgraded package: Pbind-9.2.2-20030606
06-Jun-2003: Upgraded package: Pdss-4.1.3-20030606
06-Jun-2003: Upgraded package: Pperl-xml-20030606-20030606
06-Jun-2003: Upgraded package: Prt-3.0.2-20030606
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/vcheck/ vc.cups openpkg-src/cups/ cups.spec ...
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 openpkg$ Date: 06-Jun-2003 11:22:25
Branch: HEAD Handle: 2003060610222301
Added files:
openpkg-re/vcheck vc.cups
openpkg-src/cupscups.spec
Modified files:
openpkg-web news.txt
Log:
new package: cups 1.1.19 (Common Unix Printing System)
Package _not_ usable yet, needs lot of improvements!
Summary:
RevisionChanges Path
1.1 +11 -0 openpkg-re/vcheck/vc.cups
1.1 +158 -0 openpkg-src/cups/cups.spec
1.4752 +1 -0 openpkg-web/news.txt
patch -p0 '@@ .'
Index: openpkg-re/vcheck/vc.cups
$ cvs diff -u -r0 -r1.1 vc.cups
--- /dev/null 2003-06-06 11:22:23.0 +0200
+++ vc.cups 2003-06-06 11:22:23.0 +0200
@@ -0,0 +1,11 @@
+config = {
+}
+
+prog cups = {
+ version = 1.1.19
+ url = ftp://ftp.easysw.com/pub/cups/
+ regex = ((\d+\.)+\d+)
+ url = ftp://ftp.easysw.com/pub/cups/__NEWVER__/
+ regex = cups-(__VER__)-source\.tar\.bz2
+}
+
@@ .
patch -p0 '@@ .'
Index: openpkg-src/cups/cups.spec
$ cvs diff -u -r0 -r1.1 cups.spec
--- /dev/null 2003-06-06 11:22:25.0 +0200
+++ cups.spec 2003-06-06 11:22:25.0 +0200
@@ -0,0 +1,158 @@
+##
+## cups.spec -- OpenPKG RPM Specification
+## Copyright (c) 2000-2003 Cable Wireless Deutschland GmbH
+## Copyright (c) 2000-2003 The OpenPKG Project http://www.openpkg.org/
+## Copyright (c) 2000-2003 Ralf S. Engelschall [EMAIL PROTECTED]
+##
+## Permission to use, copy, modify, and distribute this software for
+## any purpose with or without fee is hereby granted, provided that
+## the above copyright notice and this permission notice appear in all
+## copies.
+##
+## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+## SUCH DAMAGE.
+##
+
+# package information
+Name: cups
+Summary: Common Unix Printing System
+URL: http://www.cups.org/
+Vendor: Easy Software Products
+Packager: The OpenPKG Project
+Distribution: OpenPKG [JUNK]
+Group:Print
+License: GPL/LGPL with exceptions
+Version: 1.1.19
+Release: 20030606
+
+# package options
+%option with_openssl no
+
+# list of sources
+Source0:
ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
+Source1: rc.cups
+Source2: cupsd.conf
+Patch0: cups.patch
+
+# build information
+Prefix: %{l_prefix}
+BuildRoot:%{l_buildroot}
+BuildPreReq: OpenPKG, openpkg = 20030103, make, gcc, zlib, jpeg, png, tiff
+PreReq: OpenPKG, openpkg = 20030103
+%if %{with_openssl} == yes
+BuildPreReq: openssl
+%endif
+AutoReq: no
+AutoReqProv: no
+
+%description
+CUPS provides a portable printing layer for Unix-based operating
+systems. It has been developed by Easy Software Products to promote
+a standard printing solution for all Unix vendors and users.
+
+CUPS provides the System V and Berkeley command-line interfaces and
+uses the Internet Printing Protocol (IPP) as the basis for managing
+print jobs and queues.
+
+%prep
+%setup -q
+%patch -p0
+%{l_shtool} subst \
+-e 's;^.SILENT:.*$;;' \
+Makedefs.in
+%{l_shtool} subst \
+-e 's;$libdir/cups;$exec_prefix/libexec/cups;g' \
+-e 's;/spool/cups;/spool;g' \
+config-scripts/cups-directories.m4 \
+configure
+%{l_shtool} subst \
+-e 's;^\($(LN)\) ../sbin/\(accept $(BINDIR)/.*\)$;\1 \2;' \
+systemv/Makefile
+
+%build
+CC=%{l_cc
[CVS] OpenPKG: openpkg-re/ speclint.pl
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 06-Jun-2003 12:02:18
Branch: HEAD Handle: 2003060611021700
Modified files:
openpkg-re speclint.pl
Log:
detect if the same source or patch header is given multiple times
Summary:
RevisionChanges Path
1.25+11 -0 openpkg-re/speclint.pl
patch -p0 '@@ .'
Index: openpkg-re/speclint.pl
$ cvs diff -u -r1.24 -r1.25 speclint.pl
--- openpkg-re/speclint.pl14 May 2003 18:57:21 - 1.24
+++ openpkg-re/speclint.pl6 Jun 2003 10:02:17 - 1.25
@@ -346,8 +346,12 @@
Group:^Unknown$
License:^DoePL$
));
+my @headers_mult = (qw(
+BuildPreReq PreReq Provides Conflicts
+));
my @seen = ();
+my %count = ();
my $done = ''; my $this = ''; my $todo = $spec;
while ($todo =~ m/^(\S+):([ \t]*)(.*?)$/m) {
$done .= $`; $this = $; $todo = $';
@@ -387,6 +391,7 @@
}
}
push(@seen, $header);
+$count{$header}++;
$done .= $this;
}
@@ -405,6 +410,12 @@
}
}
+# check for multiple occurrence headers
+foreach my $seen (@seen) {
+if ($count{$seen} 1 and not (grep { $_ eq $seen } @headers_mult)) {
+lint_error($file, undef, undef, RPM header \$seen\ occurs multiple
times (expected just once));
+}
+}
}
## _
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/vcheck/ vc.ghostscript-esp openpkg-src/ghost...
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 openpkg$ Date: 06-Jun-2003 12:02:59
Branch: HEAD Handle: 2003060611025503
Added files:
openpkg-re/vcheck vc.ghostscript-esp
openpkg-src/ghostscript-esp
ghostscript-esp.spec
Modified files:
openpkg-web news.txt
Log:
new package: ghostscript-esp 7.05.6 (ESP Ghostscript, Postscript and
PDF Rendering Engine)
Summary:
RevisionChanges Path
1.1 +19 -0 openpkg-re/vcheck/vc.ghostscript-esp
1.1 +120 -0 openpkg-src/ghostscript-esp/ghostscript-esp.spec
1.4753 +1 -0 openpkg-web/news.txt
patch -p0 '@@ .'
Index: openpkg-re/vcheck/vc.ghostscript-esp
$ cvs diff -u -r0 -r1.1 vc.ghostscript-esp
--- /dev/null 2003-06-06 12:02:56.0 +0200
+++ vc.ghostscript-esp2003-06-06 12:02:56.0 +0200
@@ -0,0 +1,19 @@
+config = {
+}
+
+prog ghostscript-esp = {
+ version = 7.05.6
+ url = http://osdn.dl.sourceforge.net/sourceforge/espgs/
+ regex = espgs-(__VER__)-source\.tar\.bz2
+}
+prog ghostscript-esp:gnu-gs-fonts-other = {
+ version = 6.0
+ url = ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/fonts/
+ regex = gnu-gs-fonts-other-(__VER__)\.tar\.gz
+}
+prog ghostscript-esp:gnu-gs-fonts-std = {
+ version = 6.0
+ url = ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/fonts/
+ regex = gnu-gs-fonts-std-(__VER__)\.tar\.gz
+}
+
@@ .
patch -p0 '@@ .'
Index: openpkg-src/ghostscript-esp/ghostscript-esp.spec
$ cvs diff -u -r0 -r1.1 ghostscript-esp.spec
--- /dev/null 2003-06-06 12:02:59.0 +0200
+++ ghostscript-esp.spec 2003-06-06 12:02:59.0 +0200
@@ -0,0 +1,120 @@
+##
+## ghostscript-esp.spec -- OpenPKG RPM Specification
+## Copyright (c) 2000-2003 Cable Wireless Deutschland GmbH
+## Copyright (c) 2000-2003 The OpenPKG Project http://www.openpkg.org/
+## Copyright (c) 2000-2003 Ralf S. Engelschall [EMAIL PROTECTED]
+##
+## Permission to use, copy, modify, and distribute this software for
+## any purpose with or without fee is hereby granted, provided that
+## the above copyright notice and this permission notice appear in all
+## copies.
+##
+## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+## SUCH DAMAGE.
+##
+
+# package versions
+%define V_espgs 7.05.6
+%define V_fonts 6.0
+
+# package information
+Name: ghostscript-esp
+Summary: ESP Ghostscript, Postscript and PDF Rendering Engine
+URL: http://sourceforge.net/projects/espgs/
+Vendor: Easy Software Products
+Packager: The OpenPKG Project
+Distribution: OpenPKG [EVAL]
+Group:Graphics
+License: GPL
+Version: %{V_espgs}
+Release: 20030606
+
+# list of sources
+Source0:
http://osdn.dl.sourceforge.net/sourceforge/espgs/espgs-%{V_espgs}-source.tar.bz2
+Source1:
ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/fonts/gnu-gs-fonts-std-%{V_fonts}.tar.gz
+Source2:
ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/fonts/gnu-gs-fonts-other-%{V_fonts}.tar.gz
+
+# build information
+Prefix: %{l_prefix}
+BuildRoot:%{l_buildroot}
+BuildPreReq: OpenPKG, openpkg = 20030103, X11, cups, make, gcc, glib, zlib, jpeg,
png
+PreReq: OpenPKG, openpkg = 20030103, X11, cups
+AutoReq: no
+AutoReqProv: no
+
+%description
+ESP Ghostscript is an enhanced version of GNU Ghostscript that
+includes new printer drivers and support for the Common Unix
+Printing System.
+
+%prep
+%setup0 -q -n espgs-%{V_espgs
[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]
Re: Berkeley DB4 Patch
On Saturday 31 May 2003 13:54, Ralf S. Engelschall wrote: The reason to me seems that you don't provide a lot of fancy named links to libdb.a. That's correct. But IMHO those fancy names are nasty and I think we should not play this game in OpenPKG, because it introduces mud into the package. Instead, fixing or tweaking those packages which are unable to find a straight-forward libdb.a should be fixed by us. well it seems the majority feels OK about having this links I agree that this is not a 100% good indication though. In OpenPKG we went the hard way and fixed many packages so they work with the latest Berkeley-DB 4.1 Hmm I think I would prefer having the links over patching configure scripts of all dependend packages on a regular basis - because patching configure scripts is what I regard as nasty. I would prefer to create the environment to have internet sources built almost unmodified. Sorry I don't follow you here. But it's your show. Choose your poison. __ The OpenPKG Projectwww.openpkg.org Developer Communication List [EMAIL PROTECTED]
proftp ldap support
Hi,
here comes a patch to add ldap functionality to proftpd
(current proftpd-1.2.8-20030606)
ldap support is optional after the scheme I found elsewhere in openpkg.
The sources need a little patch to link against additional libs:
ldap depends on openssl and so ssl and crypto must as well
be linked in.
See if you like it.
Tassilo--- mod_ldap.patch.orig 2003-05-17 17:04:15.0 +0200
+++ mod_ldap.patch 2003-05-17 14:27:35.0 +0200
@@ -0,0 +1,7 @@
+*** contrib/mod_ldap.c.orig 2003-01-26 17:45:20.0 +0100
+--- contrib/mod_ldap.c 2003-01-26 17:45:30.0 +0100
+***
+*** 64
+! * $Libraries: -lldap -llber$
+--- 64
+! * $Libraries: -lldap -llber -lssl -lcrypto$
--- proftpd.spec.orig 2003-06-06 17:27:02.0 +0200
+++ proftpd.spec 2003-06-06 17:30:48.0 +0200
@@ -39,6 +39,7 @@
%option with_mysql no
%option with_pamno
%option with_pgsql no
+%option with_ldap no
# list of sources
Source0: ftp://ftp.proftpd.net/distrib/source/proftpd-%{version}.tar.bz2
@@ -46,6 +47,7 @@
Source2: proftpd.msg.goaway
Source3: proftpd.msg.login
Source4: rc.proftpd
+Patch0: mod_ldap.patch
# build information
Prefix: %{l_prefix}
@@ -62,6 +64,10 @@
%if %{with_pgsql} == yes
BuildPreReq: postgresql, openssl
%endif
+%if %{with_ldap} == yes
+BuildPreReq: openldap
+PreReq: openldap
+%endif
AutoReq: no
AutoReqProv: no
@@ -83,6 +89,7 @@
%prep
%setup -q
+%patch0
# utils also require link with getopt
%{l_shtool} subst \
-e 's;\(\$(BUILD_FTPCOUNT_OBJS).*\);\1 %{l_ldflags} -lgetopt;g' \
@@ -116,6 +123,9 @@
MOD=$MOD:mod_sql_mysql
MOD_LIB=MOD_LIB:%{l_prefix}/lib/mysql
%endif
+%if %{with_ldap} == yes
+MOD=$MOD:mod_ldap
+%endif
%if %{with_pgsql} == yes
MOD=$MOD:mod_sql_postgres
%{l_shtool} subst \
[CVS] OpenPKG: openpkg-src/proftpd/ proftpd.spec
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: 06-Jun-2003 18:38:14
Branch: HEAD Handle: 2003060617381400
Modified files:
openpkg-src/proftpd proftpd.spec
Log:
add LDAP support, polishing mysql/pgsql options
Summary:
RevisionChanges Path
1.52+27 -5 openpkg-src/proftpd/proftpd.spec
patch -p0 '@@ .'
Index: openpkg-src/proftpd/proftpd.spec
$ cvs diff -u -r1.51 -r1.52 proftpd.spec
--- openpkg-src/proftpd/proftpd.spec 6 Jun 2003 10:29:27 - 1.51
+++ openpkg-src/proftpd/proftpd.spec 6 Jun 2003 16:38:14 - 1.52
@@ -39,6 +39,12 @@
%option with_mysql no
%option with_pamno
%option with_pgsql no
+%option with_ldap no
+
+# checking option conflicts
+%if %{with_mysql} == yes %{with_pgsql} == yes
+RPM ERROR: with_mysql conflicts with with_pgsql
+%endif
# list of sources
Source0: ftp://ftp.proftpd.net/distrib/source/proftpd-%{version}.tar.bz2
@@ -62,6 +68,10 @@
%if %{with_pgsql} == yes
BuildPreReq: postgresql, openssl
%endif
+%if %{with_ldap} == yes
+BuildPreReq: openldap, openssl
+PreReq: openldap
+%endif
AutoReq: no
AutoReqProv: no
@@ -90,10 +100,23 @@
-e 's;\(\$(BUILD_FTPTOP_OBJS).*\);\1 %{l_ldflags} -lgetopt;g' \
-e 's;\(\$(BUILD_FTPWHO_OBJS).*\);\1 %{l_ldflags} -lgetopt;g' \
Makefile.in
+%if %{with_mysql} == yes
+libs=`mysql_config --libs`
+# libmysqlclient may require more libraries
+%{l_shtool} subst \
+-e s;\(-lmysqlclient\);$libs;g \
+contrib/mod_sql_mysql.c
+%endif
# libpq also requires openssl
+# postgresql also doesn't provide its own inlude subdirectory
%{l_shtool} subst \
--e 's;-lpq;-lpq -lssl -lcrypto;g' \
+-e 's;\(-lpq\);\1 -lssl -lcrypto;g' \
+-e 's;^\(#include \)pgsql/\(libpq-fe.h.*\)$;\1\2;' \
contrib/mod_sql_postgres.c
+# libldap also requires openssl
+%{l_shtool} subst \
+-e 's;\(-llber\);\1 -lssl -lcrypto;g' \
+contrib/mod_ldap.c
%build
# make non-standard rundir the same as standard sysconfdir
@@ -114,14 +137,13 @@
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
+%if %{with_ldap} == yes
+MOD=$MOD:mod_ldap
%endif
CC=%{l_cc} \
CFLAGS=%{l_cflags -O} \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[OpenPKG] Version Tracking Report (2003-06-06 19:29)
OpenPKG Version Tracking Report === Reporting Time:2003-06-06 19:29 Tracking Duration: 0:28:48 (H:M:S) Tracking Input:806 sources (529 packages) Tracking Result: 795 up-to-date, 1 out-dated, 10 error The following 1 sources were determined to be out-dated because newer vendor versions were found. Upgrade the corresponding OpenPKG packages. - - - Package Old Version New Version - - - linkchecker 1.8.161.8.17 - - - The following 10 sources could not be successfully checked because an error occurred while processing. Keep at least an eye on them. - - - Package Old Version Error - - - doxygen 1.3.1 connection failed or ti.. gdk-pixbuf0.22.02nd connection failed o.. libart2.3.122nd connection failed o.. lout 3.28 connection failed or ti.. perl-net:Net-Services 1.3 regex didn't match (p [1] postgresql:psqlodbc 07.03.0100connection failed or ti.. rdist 7.0.0-alpha10 connection failed or ti.. skey 1.1.5 regex didn't match (pro.. smtpfeed 1.18 connection failed or [2] xmms 1.2.7 regex didn't match (pro.. - - - [1] perl-net:Net-Services: rse: seems it has been disappeared from CPAN [2] smtpfeed: thl: master site down and only known mirror is netsw! The remaining 795 sources were successfully determined to be still up to date. No action is required on your part. Just be happy ;) OpenPKG Version Tracker [EMAIL PROTECTED] __ The OpenPKG Projectwww.openpkg.org Developer Communication List [EMAIL PROTECTED]
Re: proftp ldap support
On Fri, Jun 06, 2003, Tassilo Erlewein wrote: here comes a patch to add ldap functionality to proftpd (current proftpd-1.2.8-20030606) ldap support is optional after the scheme I found elsewhere in openpkg. The sources need a little patch to link against additional libs: ldap depends on openssl and so ssl and crypto must as well be linked in. See if you like it. Thanks for your contribution. Michael v.E. has applied it (in an adjusted version) to proftpd in OpenPKG-CURRENT. See http://cvs.openpkg.org/chngview?cn=9672 for more details. See the new proftpd-1.2.8-20030306.src.rpm for results. Ralf S. Engelschall [EMAIL PROTECTED] www.engelschall.com __ The OpenPKG Projectwww.openpkg.org Developer Communication List [EMAIL PROTECTED]
[OpenPKG #88] openpkg-20030114-20030114.src.sh
Request 88 was acted upon. This is an automatically generated message. URL: https://rt.openpkg.org/id/88 Ticket: [OpenPKG #88] Subject: openpkg-20030114-20030114.src.sh Requestors: [EMAIL PROTECTED] Queue: openpkg Owner: Nobody Status: resolved Transaction: Status changed from new to resolved by rse Time: Fri Jun 06 19:32:57 2003 _ According to our records, your request has been resolved. If you have any further questions or concerns, please just respond to this message.
[OpenPKG #95] enhance RT: marks URLs in messages with hyperlinks fix reformatting/reordering
Request 95 was acted upon. _ URL: https://rt.openpkg.org/id/95 Ticket: [OpenPKG #95] Subject: enhance RT: marks URLs in messages with hyperlinks fix reformatting/reordering Requestors: Queue: openpkg Owner: Nobody Status: open Transaction: Correspondence added by rse Time: Fri Jun 06 19:37:05 2003 Additionally, RT tries to reformat the message body for syntax highlighting and whatever else reasons. Unfortunately, this often results in totally garbled message bodies on display. Especially it reorders the quoting blocks. So I recommend to completely remove the reformatting.
