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: 15-Sep-2003 20:07:34
Branch: HEAD Handle: 2003091519073202
Added files:
openpkg-src/cfengine cfengine.patch
Modified files:
openpkg-src/cfengine cfengine.spec
openpkg-web news.txt
Log:
While poking around on the net about OpenPKG, I found a small patch under
http://groups.google.com/groups?selm=mailman.228.1062771359.18171.help-cfengine%40gnu.org&oe=utf-8&output=gplain
for cfengine which fixes its RPM usage. Include it here.
Summary:
Revision Changes Path
1.1 +11 -0 openpkg-src/cfengine/cfengine.patch
1.30 +3 -1 openpkg-src/cfengine/cfengine.spec
1.6569 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cfengine/cfengine.patch
============================================================================
$ cvs diff -u -r0 -r1.1 cfengine.patch
--- /dev/null 2003-09-15 20:07:34.000000000 +0200
+++ cfengine.patch 2003-09-15 20:07:34.000000000 +0200
@@ -0,0 +1,11 @@
+--- src/package.c.orig 2003-08-18 15:25:03.000000000 +0200
++++ src/package.c 2003-09-15 20:05:06.000000000 +0200
+@@ -75,7 +75,7 @@
+ enum cmpsense result;
+ int match = 0;
+
+-snprintf(VBUFF,bufsize,"/bin/rpm -q --queryformat
%{EPOCH}:%{VERSION}-%{RELEASE}\\n %s", package);
++snprintf(VBUFF,bufsize,"/bin/rpm -q --queryformat
'%%{EPOCH}:%%{VERSION}-%%{RELEASE}'\\n %s", package);
+
+ if ((pp = cfpopen(VBUFF, "r")) == NULL)
+ {
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cfengine/cfengine.spec
============================================================================
$ cvs diff -u -r1.29 -r1.30 cfengine.spec
--- openpkg-src/cfengine/cfengine.spec 29 Aug 2003 18:06:08 -0000 1.29
+++ openpkg-src/cfengine/cfengine.spec 15 Sep 2003 18:07:34 -0000 1.30
@@ -33,7 +33,7 @@
Group: System
License: GPL
Version: 2.0.8
-Release: 20030829
+Release: 20030915
# package options
%option with_fsl yes
@@ -42,6 +42,7 @@
Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-%{version}.tar.gz
Source1: rc.cfengine
Source2: fsl.cfengine
+Patch0: cfengine.patch
# build information
Prefix: %{l_prefix}
@@ -67,6 +68,7 @@
%prep
%setup -q
+ %patch -p0
%build
CC="%{l_cc}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6568 -r1.6569 news.txt
--- openpkg-web/news.txt 15 Sep 2003 13:43:00 -0000 1.6568
+++ openpkg-web/news.txt 15 Sep 2003 18:07:32 -0000 1.6569
@@ -1,3 +1,4 @@
+15-Sep-2003: Upgraded package: P<cfengine-2.0.8-20030915>
15-Sep-2003: Upgraded package: P<perl-5.8.0-1.2.1>
15-Sep-2003: Upgraded package: P<perl-5.8.0-1.3.1>
15-Sep-2003: Upgraded package: P<perl-5.8.0-20030915>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]