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: 10-Jun-2003 17:03:38
Branch: HEAD Handle: 2003061016033701
Added files:
openpkg-src/gzip gzip.patch
Modified files:
openpkg-src/gzip gzip.spec
openpkg-web news.txt
Log:
- include security bugfix for znew(1)
- simplify packaging by using (now existing) DESTDIR support
- redirect to use (internal -- to avoid extra dep) Bash because
the scripts heavily use the "set -C" (noclobber) feature
Summary:
Revision Changes Path
1.1 +13 -0 openpkg-src/gzip/gzip.patch
1.27 +6 -5 openpkg-src/gzip/gzip.spec
1.4799 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gzip/gzip.patch
============================================================================
$ cvs diff -u -r0 -r1.1 gzip.patch
--- /dev/null 2003-06-10 17:03:38.000000000 +0200
+++ gzip.patch 2003-06-10 17:03:38.000000000 +0200
@@ -0,0 +1,13 @@
+--- znew.in.orig Fri Sep 27 08:17:09 2002
++++ znew.in Tue Jun 10 16:30:29 2003
+@@ -16,8 +16,8 @@
+ warn="(does not preserve modes and timestamp)"
+ tmp=/tmp/zfoo.$$
+ set -C
+-echo hi > $tmp.1
+-echo hi > $tmp.2
++echo hi > $tmp.1 || exit 1
++echo hi > $tmp.2 || exit 1
+ if test -z "`(${CPMOD-cpmod} $tmp.1 $tmp.2) 2>&1`"; then
+ cpmod=${CPMOD-cpmod}
+ warn=""
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gzip/gzip.spec
============================================================================
$ cvs diff -u -r1.26 -r1.27 gzip.spec
--- openpkg-src/gzip/gzip.spec 9 Apr 2003 13:38:39 -0000 1.26
+++ openpkg-src/gzip/gzip.spec 10 Jun 2003 15:03:38 -0000 1.27
@@ -33,10 +33,11 @@
Group: Compression
License: GPL
Version: 1.3.5
-Release: 20030409
+Release: 20030610
# list of sources
Source0: ftp://alpha.gnu.org/gnu/gzip/gzip-%{version}.tar.gz
+Patch0: gzip.patch
# build information
Prefix: %{l_prefix}
@@ -58,20 +59,20 @@
%prep
%setup -q
+ %patch -p0
%build
+ echo "ac_cv_path_shell=%{l_bash}" >config.cache
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
./configure \
+ --cache-file=./config.cache \
--prefix=%{l_prefix}
%{l_make} %{l_mflags -O}
%install
rm -rf $RPM_BUILD_ROOT
- %{l_shtool} subst -v \
- -e "s;\\(prefix *= *\\).*;\\1 $RPM_BUILD_ROOT%{l_prefix};" \
- Makefile
- %{l_make} %{l_mflags} install prefix=$RPM_BUILD_ROOT%{l_prefix}
+ %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4798 -r1.4799 news.txt
--- openpkg-web/news.txt 10 Jun 2003 12:11:43 -0000 1.4798
+++ openpkg-web/news.txt 10 Jun 2003 15:03:37 -0000 1.4799
@@ -1,3 +1,4 @@
+10-Jun-2003: Upgraded package: P<gzip-1.3.5-20030610>
10-Jun-2003: Upgraded package: P<mutt-1.4.1i-20030610>
10-Jun-2003: Upgraded package: P<dss-4.1.3-20030610>
10-Jun-2003: Upgraded package: P<xterm-1.79-20030610>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]