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: 29-Oct-2003 13:06:41
Branch: HEAD Handle: 2003102912063902
Modified files:
openpkg-src/amd amd.patch amd.spec
openpkg-web news.txt
Log:
cleanup patch and especially port to Solaris 10
Summary:
Revision Changes Path
1.6 +80 -78 openpkg-src/amd/amd.patch
1.51 +2 -2 openpkg-src/amd/amd.spec
1.7215 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/amd/amd.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 amd.patch
--- openpkg-src/amd/amd.patch 31 Jan 2003 12:13:56 -0000 1.5
+++ openpkg-src/amd/amd.patch 29 Oct 2003 12:06:41 -0000 1.6
@@ -1,6 +1,6 @@
-diff -Naur am-utils-6.0.9.orig/conf/nfs_prot/nfs_prot_freebsd3.h
am-utils-6.0.9/conf/nfs_prot/nfs_prot_freebsd3.h
---- am-utils-6.0.9.orig/conf/nfs_prot/nfs_prot_freebsd3.h Sat Dec 28 15:49:11
2002
-+++ am-utils-6.0.9/conf/nfs_prot/nfs_prot_freebsd3.h Mon Jan 27 19:26:55 2003
+Index: conf/nfs_prot/nfs_prot_freebsd3.h
+--- conf/nfs_prot/nfs_prot_freebsd3.h.orig 2002-12-28 15:49:11.000000000 +0100
++++ conf/nfs_prot/nfs_prot_freebsd3.h 2003-10-29 12:15:56.000000000 +0100
@@ -54,6 +54,9 @@
#ifdef HAVE_NFS_NFS_H
# include <nfs/nfs.h>
@@ -11,33 +11,36 @@
#ifdef HAVE_UFS_UFS_UFSMOUNT_H
# include <ufs/ufs/ufsmount.h>
#endif /* HAVE_UFS_UFS_UFSMOUNT_H */
-diff -Naur am-utils-6.0.9.orig/config.h.in am-utils-6.0.9/config.h.in
---- am-utils-6.0.9.orig/config.h.in Sat Jan 25 16:10:26 2003
-+++ am-utils-6.0.9/config.h.in Mon Jan 27 19:25:36 2003
-@@ -657,6 +657,9 @@
- /* Define to 1 if you have the <nfs/nfs.h> header file. */
- #undef HAVE_NFS_NFS_H
+Index: include/am_defs.h
+--- include/am_defs.h.orig 2002-12-28 15:49:23.000000000 +0100
++++ include/am_defs.h 2003-10-29 12:15:56.000000000 +0100
+@@ -276,7 +276,7 @@
+ /*
+ * Actions to take if <malloc.h> exists.
+ */
+-#ifdef HAVE_MALLOC_H
++#if defined(HAVE_MALLOC_H) && !defined(__FreeBSD__)
+ # include <malloc.h>
+ #endif /* HAVE_MALLOC_H */
-+/* Define if you have the <nfsclient/nfs.h> header file. */
-+#undef HAVE_NFSCLIENT_NFS_H
-+
- /* Define to 1 if you have the <nfs/nfs_mount.h> header file. */
- #undef HAVE_NFS_NFS_MOUNT_H
+@@ -338,6 +338,14 @@
+ /* ensure that struct datum is not included again from <rpcsvc/yp_prot.h> */
+ # define DATUM
+ # endif /* not DATUM */
++# else /* not HAVE_DB1_NDBM_H */
++# ifdef HAVE_GDBM_NDBM_H
++# include <gdbm/ndbm.h>
++# ifndef DATUM
++/* ensure that struct datum is not included again from <rpcsvc/yp_prot.h> */
++# define DATUM
++# endif /* not DATUM */
++# endif /* HAVE_GDBM_NDBM_H */
+ # endif /* HAVE_DB1_NDBM_H */
+ #endif /* HAVE_NDBM_H */
-diff -Naur am-utils-6.0.9.orig/configure am-utils-6.0.9/configure
---- am-utils-6.0.9.orig/configure Sat Jan 25 16:10:25 2003
-+++ am-utils-6.0.9/configure Mon Jan 27 19:23:46 2003
-@@ -13042,6 +13042,7 @@
- nfs/export.h \
- nfs/mount.h \
- nfs/nfs.h \
-+ nfsclient/nfs.h \
- nfs/nfs_clnt.h \
- nfs/nfs_gfs.h \
- nfs/nfs_mount.h \
-diff -Naur am-utils-6.0.9.orig/hlfsd/stubs.c am-utils-6.0.9/hlfsd/stubs.c
---- am-utils-6.0.9.orig/hlfsd/stubs.c Sat Dec 28 15:49:22 2002
-+++ am-utils-6.0.9/hlfsd/stubs.c Mon Jan 27 19:35:01 2003
+Index: hlfsd/stubs.c
+--- hlfsd/stubs.c.orig 2002-12-28 15:49:22.000000000 +0100
++++ hlfsd/stubs.c 2003-10-29 12:15:56.000000000 +0100
@@ -133,7 +133,7 @@
res.ns_u.ns_attr_u = rootfattr;
} else if (eq_fh(argp, &slink)) {
@@ -56,40 +59,9 @@
/*
* This code is needed to defeat Solaris 2.4's (and newer) symlink
* values cache. It forces the last-modified time of the symlink to be
-diff -Naur am-utils-6.0.9.orig/include/am_defs.h am-utils-6.0.9/include/am_defs.h
---- am-utils-6.0.9.orig/include/am_defs.h Sat Dec 28 15:49:23 2002
-+++ am-utils-6.0.9/include/am_defs.h Mon Jan 27 09:57:05 2003
-@@ -276,7 +276,7 @@
- /*
- * Actions to take if <malloc.h> exists.
- */
--#ifdef HAVE_MALLOC_H
-+#if defined(HAVE_MALLOC_H) && !defined(__FreeBSD__)
- # include <malloc.h>
- #endif /* HAVE_MALLOC_H */
-
---- am-utils-6.0.9/configure.orig Fri Jan 31 12:21:41 2003
-+++ am-utils-6.0.9/configure Fri Jan 31 12:23:07 2003
-@@ -13020,6 +13020,7 @@
- cdfs/cdfsmount.h \
- cdfs/cdfs_mount.h \
- db1/ndbm.h \
-+ gdbm/ndbm.h \
- hsfs/hsfs.h \
- isofs/cd9660/cd9660_mount.h \
- linux/auto_fs.h \
---- am-utils-6.0.9/configure.in.orig Fri Jan 31 12:21:56 2003
-+++ am-utils-6.0.9/configure.in Fri Jan 31 12:23:29 2003
-@@ -409,6 +409,7 @@
- cdfs/cdfsmount.h \
- cdfs/cdfs_mount.h \
- db1/ndbm.h \
-+ gdbm/ndbm.h \
- hsfs/hsfs.h \
- isofs/cd9660/cd9660_mount.h \
- linux/auto_fs.h \
---- am-utils-6.0.9/config.h.in.orig Fri Jan 31 12:22:12 2003
-+++ am-utils-6.0.9/config.h.in Fri Jan 31 12:25:59 2003
+Index: config.h.in
+--- config.h.in.orig 2003-01-25 16:10:26.000000000 +0100
++++ config.h.in 2003-10-29 12:15:56.000000000 +0100
@@ -164,6 +164,9 @@
/* Define to 1 if you have the <db1/ndbm.h> header file. */
#undef HAVE_DB1_NDBM_H
@@ -100,20 +72,50 @@
/* Define to 1 if you have the `dbm_open' function. */
#undef HAVE_DBM_OPEN
---- am-utils-6.0.9/include/am_defs.h.orig Fri Jan 31 12:22:29 2003
-+++ am-utils-6.0.9/include/am_defs.h Fri Jan 31 12:24:45 2003
-@@ -338,6 +338,14 @@
- /* ensure that struct datum is not included again from <rpcsvc/yp_prot.h> */
- # define DATUM
- # endif /* not DATUM */
-+# else /* not HAVE_DB1_NDBM_H */
-+# ifdef HAVE_GDBM_NDBM_H
-+# include <gdbm/ndbm.h>
-+# ifndef DATUM
-+/* ensure that struct datum is not included again from <rpcsvc/yp_prot.h> */
-+# define DATUM
-+# endif /* not DATUM */
-+# endif /* HAVE_GDBM_NDBM_H */
- # endif /* HAVE_DB1_NDBM_H */
- #endif /* HAVE_NDBM_H */
+@@ -657,6 +660,9 @@
+ /* Define to 1 if you have the <nfs/nfs.h> header file. */
+ #undef HAVE_NFS_NFS_H
+
++/* Define if you have the <nfsclient/nfs.h> header file. */
++#undef HAVE_NFSCLIENT_NFS_H
++
+ /* Define to 1 if you have the <nfs/nfs_mount.h> header file. */
+ #undef HAVE_NFS_NFS_MOUNT_H
+Index: configure
+--- configure.orig 2003-01-25 16:10:25.000000000 +0100
++++ configure 2003-10-29 12:24:29.000000000 +0100
+@@ -9247,7 +9247,7 @@
+ ;;
+ esac
+ ;;
+- sunos[34]* | solaris1* | solaris2.[0-5]* | sunos5.[0-5]* )
++ sunos[34]* | solaris1* | solaris2.[0-5] | solaris2.[0-5].* | sunos5.[0-5] |
sunos5.[0-5].* )
+ ac_cv_os_cflags="" ;;
+ solaris* | sunos* )
+ # turn on 64-bit file offset interface
+@@ -13020,6 +13020,7 @@
+ cdfs/cdfsmount.h \
+ cdfs/cdfs_mount.h \
+ db1/ndbm.h \
++ gdbm/ndbm.h \
+ hsfs/hsfs.h \
+ isofs/cd9660/cd9660_mount.h \
+ linux/auto_fs.h \
+@@ -13042,6 +13043,7 @@
+ nfs/export.h \
+ nfs/mount.h \
+ nfs/nfs.h \
++ nfsclient/nfs.h \
+ nfs/nfs_clnt.h \
+ nfs/nfs_gfs.h \
+ nfs/nfs_mount.h \
+@@ -13553,7 +13555,7 @@
+ ac_cv_nfs_prot_headers=sunos3 ;;
+ sunos4* | solaris1* )
+ ac_cv_nfs_prot_headers=sunos4 ;;
+- sunos5.[0-3]* | solaris2.[0-3]* )
++ sunos5.[0-3]* | solaris2.[0-3] | solaris2.[0-3].* )
+ ac_cv_nfs_prot_headers=sunos5_3 ;;
+ sunos5.4* | solaris2.4* )
+ ac_cv_nfs_prot_headers=sunos5_4 ;;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/amd/amd.spec
============================================================================
$ cvs diff -u -r1.50 -r1.51 amd.spec
--- openpkg-src/amd/amd.spec 9 Sep 2003 09:35:27 -0000 1.50
+++ openpkg-src/amd/amd.spec 29 Oct 2003 12:06:41 -0000 1.51
@@ -33,7 +33,7 @@
Group: System
License: BSD
Version: 6.0.9
-Release: 20030909
+Release: 20031029
# list of sources
Source0: ftp://ftp.am-utils.org/pub/am-utils/am-utils-%{version}.tar.gz
@@ -68,7 +68,7 @@
%prep
%setup -q -n am-utils-%{version}
- %patch -p1
+ %patch -p0
%build
# disable system LDAP support because it makes trouble (at least under
Solaris 9)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7214 -r1.7215 news.txt
--- openpkg-web/news.txt 29 Oct 2003 08:52:46 -0000 1.7214
+++ openpkg-web/news.txt 29 Oct 2003 12:06:39 -0000 1.7215
@@ -1,3 +1,4 @@
+29-Oct-2003: Upgraded package: P<amd-6.0.9-20031029>
29-Oct-2003: Upgraded package: P<libxml-2.6.1-20031029>
29-Oct-2003: Upgraded package: P<perl-comp-20031029-20031029>
29-Oct-2003: Upgraded package: P<mozilla-mplayer-1.0p2-20031029>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
