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: 04-Aug-2003 11:41:03
Branch: HEAD Handle: 2003080410410102
Modified files:
openpkg-src/apg apg.patch apg.spec
openpkg-web news.txt
Log:
upgrade apg 2.1.0 -> 2.2.0, standalone version only
Summary:
Revision Changes Path
1.2 +5 -16 openpkg-src/apg/apg.patch
1.30 +7 -16 openpkg-src/apg/apg.spec
1.6016 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apg/apg.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 apg.patch
--- openpkg-src/apg/apg.patch 11 Feb 2003 14:35:54 -0000 1.1
+++ openpkg-src/apg/apg.patch 4 Aug 2003 09:41:03 -0000 1.2
@@ -1,22 +1,11 @@
---- apg.c.org Tue Feb 11 15:11:31 2003
-+++ apg.c Tue Feb 11 15:10:52 2003
-@@ -132,7 +132,7 @@
+--- apg.c.dist 2003-08-04 11:30:09.000000000 +0200
++++ apg.c 2003-08-04 11:30:33.000000000 +0200
+@@ -150,7 +150,7 @@
#endif /* APG_USE_CRYPT */
#endif /* CLISERV */
#ifdef CLISERV
--#ifdef sgi /* Thanks to Andrew J. Caird */
-+#ifdef NEED_SOCKLEN_T /* Thanks to Andrew J. Caird */
+-#if defined(sgi) || defined(__APPLE__) || defined(__QNX__) /* Thanks to Andrew J.
Caird */
++#if defined(sgi) || defined(__APPLE__) || defined(__QNX__) ||
defined(NEED_SOCKLEN_T) /* Thanks to Andrew J. Caird */
typedef unsigned int socklen_t;
#endif
socklen_t len;
---- Makefile.org Tue Feb 11 15:32:34 2003
-+++ Makefile Tue Feb 11 15:32:50 2003
-@@ -6,7 +6,7 @@
- ##################################################################
- # Compilation flags
- # You should comment the line below for AIX+native cc
--FLAGS = -Wall
-+FLAGS = -Wall ${CFLAGS}
-
- ##################################################################
- # Libraries
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apg/apg.spec
============================================================================
$ cvs diff -u -r1.29 -r1.30 apg.spec
--- openpkg-src/apg/apg.spec 8 Jul 2003 14:38:38 -0000 1.29
+++ openpkg-src/apg/apg.spec 4 Aug 2003 09:41:03 -0000 1.30
@@ -32,8 +32,8 @@
Distribution: OpenPKG [PLUS]
Group: System
License: GPL
-Version: 2.1.0
-Release: 20030611
+Version: 2.2.0
+Release: 20030804
# list of sources
Source0: http://www.adel.nursat.kz/apg/download/apg-%{version}.tar.gz
@@ -57,6 +57,7 @@
%prep
%setup -q
+ chmod 755 . */. */*/. */*/*/.
%patch -p0
%{l_shtool} subst -s -e 's/^#.*include.*syslog\.h.*$//' apg.c
%{l_shtool} subst -s -e 's/syslog.*LOG_.*;\(.*\)$/;\1/' apg.c errors.c
@@ -73,26 +74,16 @@
*-solaris* ) libs="-lnsl -lsocket" ;;
*-irix* ) libs="-lnsl -lsocket" ; defs="-DNEED_SOCKLEN_T";;
esac
- %{l_make} %{l_mflags -O} \
+ %{l_make} %{l_mflags -O} standalone \
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O} $defs" \
CS_LIBS="$libs"
%install
rm -rf $RPM_BUILD_ROOT
- %{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/bin \
- $RPM_BUILD_ROOT%{l_prefix}/sbin \
- $RPM_BUILD_ROOT%{l_prefix}/man/man1 \
- $RPM_BUILD_ROOT%{l_prefix}/man/man8
- %{l_shtool} install -c -s -m 755 \
- apg apgbfm $RPM_BUILD_ROOT%{l_prefix}/bin/
- %{l_shtool} install -c -s -m 755 \
- apgd $RPM_BUILD_ROOT%{l_prefix}/sbin/
- %{l_shtool} install -c -m 644 \
- doc/man/apg.1 doc/man/apgbfm.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
- %{l_shtool} install -c -m 644 \
- doc/man/apgd.8 $RPM_BUILD_ROOT%{l_prefix}/man/man8/
+ CHOWNPROG=true \
+ CHGRPPROG=true \
+ %{l_make} ${l_mflags} install INSTALL_PREFIX=$RPM_BUILD_ROOT%{l_prefix}
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6015 -r1.6016 news.txt
--- openpkg-web/news.txt 4 Aug 2003 08:37:38 -0000 1.6015
+++ openpkg-web/news.txt 4 Aug 2003 09:41:01 -0000 1.6016
@@ -1,3 +1,4 @@
+04-Aug-2003: Upgraded package: P<apg-2.2.0-20030804>
04-Aug-2003: Upgraded package: P<mysql3-3.23.57-20030804>
04-Aug-2003: Upgraded package: P<xmms-1.2.7-20030804>
03-Aug-2003: Upgraded package: P<ncurses-5.3.20030802-20030803>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]