OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 18-Apr-2009 13:00:48
Branch: HEAD Handle: 2009041812004700
Modified files:
openpkg-src/amd amd.patch amd.spec
Log:
fix building under newer Linux (e.g. Debian 5.0) and try to fix
run-time under Linux >= 2.6.24
Summary:
Revision Changes Path
1.18 +32 -0 openpkg-src/amd/amd.patch
1.77 +1 -1 openpkg-src/amd/amd.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/amd/amd.patch
============================================================================
$ cvs diff -u -r1.17 -r1.18 amd.patch
--- openpkg-src/amd/amd.patch 22 Dec 2007 15:37:07 -0000 1.17
+++ openpkg-src/amd/amd.patch 18 Apr 2009 11:00:47 -0000 1.18
@@ -111,3 +111,35 @@
%start F Q
%%
+Index: amd/amfs_toplvl.c
+--- amd/amfs_toplvl.c.orig 2006-03-28 18:16:43 +0200
++++ amd/amfs_toplvl.c 2009-04-18 12:41:10 +0200
+@@ -227,6 +227,10 @@
+ xstrlcat(opts, toplvl_opts, sizeof(opts));
+ }
+
++#ifdef MNTTAB_OPT_NOLOCK
++ xstrlcat(opts, ",", sizeof(opts));
++ xstrlcat(opts, MNTTAB_OPT_NOLOCK, sizeof(opts));
++#endif /* MNTTAB_OPT_NOLOCK */
+ #ifdef MNTTAB_OPT_NOAC
+ if (gopt.auto_attrcache == 0) {
+ xstrlcat(opts, ",", sizeof(opts));
+Index: configure
+--- configure.orig 2009-04-18 12:48:36 +0200
++++ configure 2009-04-18 12:50:17 +0200
+@@ -20952,8 +20952,13 @@
+ {
+
+ if (argc > 1)
++#if defined(UTS_RELEASE)
+ printf("%s", UTS_RELEASE);
+-
++#elif defined(LINUX_VERSION_CODE)
++ printf("%d", LINUX_VERSION_CODE);
++#else
++ printf("%d", 0);
++#endif
+ exit(0);
+ }
+ _ACEOF
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/amd/amd.spec
============================================================================
$ cvs diff -u -r1.76 -r1.77 amd.spec
--- openpkg-src/amd/amd.spec 1 Jan 2008 14:50:27 -0000 1.76
+++ openpkg-src/amd/amd.spec 18 Apr 2009 11:00:47 -0000 1.77
@@ -32,7 +32,7 @@
Group: System
License: BSD
Version: 6.1.5
-Release: 20080101
+Release: 20090418
# list of sources
Source0: ftp://ftp.am-utils.org/pub/am-utils/am-utils-%{version}.tar.gz
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
