OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 08-Apr-2008 23:14:36
Branch: HEAD Handle: 2008040822143500
Modified files:
openpkg-src/libarchive libarchive.patch libarchive.spec
Log:
fix building under Linux
Summary:
Revision Changes Path
1.8 +25 -4 openpkg-src/libarchive/libarchive.patch
1.113 +1 -1 openpkg-src/libarchive/libarchive.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/libarchive/libarchive.patch
============================================================================
$ cvs diff -u -r1.7 -r1.8 libarchive.patch
--- openpkg-src/libarchive/libarchive.patch 31 Mar 2008 17:45:28 -0000
1.7
+++ openpkg-src/libarchive/libarchive.patch 8 Apr 2008 21:14:35 -0000
1.8
@@ -1,6 +1,6 @@
Index: Makefile.in
---- Makefile.in.orig 2008-03-31 00:18:35 +0200
-+++ Makefile.in 2008-03-31 19:43:38 +0200
+--- Makefile.in.orig 2008-03-31 00:18:35.000000000 +0200
++++ Makefile.in 2008-04-08 23:07:22.487506516 +0200
@@ -458,7 +458,7 @@
#
lib_LTLIBRARIES = libarchive.la
@@ -11,8 +11,8 @@
# Always build and test both bsdtar and bsdcpio as part of 'distcheck'
DISTCHECK_CONFIGURE_FLAGS = --enable-bsdtar --enable-bsdcpio
Index: cpio/cpio.c
---- cpio/cpio.c.orig 2008-03-29 19:09:21 +0100
-+++ cpio/cpio.c 2008-03-31 19:44:13 +0200
+--- cpio/cpio.c.orig 2008-03-29 19:09:21.000000000 +0100
++++ cpio/cpio.c 2008-04-08 23:07:22.487506516 +0200
@@ -54,6 +54,9 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
@@ -23,3 +23,24 @@
#include "cpio.h"
#include "matching.h"
+Index: tar/write.c
+--- tar/write.c.orig 2008-03-29 19:09:21.000000000 +0100
++++ tar/write.c 2008-04-08 23:12:23.742689957 +0200
+@@ -700,7 +700,7 @@
+ continue;
+ #endif
+
+-#ifdef __linux
++#if defined(__linux) && defined(EXT2_IOC_GETFLAGS) &&
defined(EXT2_NODUMP_FL)
+ /*
+ * Linux has a nodump flag too but to read it
+ * we have to open() the file/dir and do an ioctl on it...
+@@ -844,7 +844,7 @@
+ archive_entry_set_fflags(entry, st->st_flags, 0);
+ #endif
+
+-#ifdef __linux
++#if defined(__linux) && defined(EXT2_IOC_GETFLAGS)
+ if ((S_ISREG(st->st_mode) || S_ISDIR(st->st_mode)) &&
+ ((fd = open(accpath, O_RDONLY|O_NONBLOCK)) >= 0) &&
+ ((r = ioctl(fd, EXT2_IOC_GETFLAGS, &stflags)), close(fd), (fd =
-1), r) >= 0 &&
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/libarchive/libarchive.spec
============================================================================
$ cvs diff -u -r1.112 -r1.113 libarchive.spec
--- openpkg-src/libarchive/libarchive.spec 31 Mar 2008 06:34:25 -0000
1.112
+++ openpkg-src/libarchive/libarchive.spec 8 Apr 2008 21:14:35 -0000
1.113
@@ -32,7 +32,7 @@
Group: Archiver
License: MIT-style
Version: 2.4.17
-Release: 20080331
+Release: 20080408
# list of sources
Source0:
http://people.freebsd.org/~kientzle/libarchive/src/libarchive-%{version}.tar.gz
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
