From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 6af225ae05e1f9f12b17e9d299fc0f6f3c0af97a
Date: Mon, 03 Oct 2016 11:52:58 +0100 [thread overview]
Message-ID: <20161003105259.599A21078E81@git01.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 71562 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via 6af225ae05e1f9f12b17e9d299fc0f6f3c0af97a (commit)
via cdae26171d09e2d09dc9fa84f940c10864057f40 (commit)
via 8a909bf4bec3aee5f0b39646481a129d51bd05f9 (commit)
via 007f8e5c37d59a878b6598faf36259a15268b41e (commit)
via ee5e4c032ba8b3959a7281fae5f529ca8dbad262 (commit)
via 215b403d19d98b11d867e089cec8e035db1fd958 (commit)
via b80545fc04dbda2a9c61fe7cbc1dcc49ef9cf835 (commit)
via 7d1a996cc0d3af31f4882f33d80bd5cfed379a61 (commit)
via f5e2b33968b2aa04508fa452c5c28dc237050ef5 (commit)
via b48cd6097ea35fcf5d1c4ec0bfd1cda03cee6c3a (commit)
via 2374af0b562ae1bd5e566a5b6927e8445852c5df (commit)
via bd30175fbbab8c11151807b1ea1f5b79ae1eea9f (commit)
via cc2bd2f13d1c2be8bf1202c168d5f511461d2987 (commit)
via 968ed82c45888b506a317a5f2aef3211a669d157 (commit)
via b31a2e34db24a9dbe97e8e3378d548677df2a029 (commit)
via 26c49a05889261641be017666044afdf71838616 (commit)
via 1ef5ba3777513d522e6afde1532adf04469b99a4 (commit)
via 141a73ab3808c38969bd23cb3b9a345d6e6a6558 (commit)
via 67d4db430a8d821e2139010ef0f99cfb76a43941 (commit)
via 42e36c7e20829f140654290e7889dcf5ac1af112 (commit)
via 5b3631798e33e78fcc63a094ba3bbba412f92bbc (commit)
via 6eb986e6a397214be0f3aa685f6bb62133068867 (commit)
from d830721f6e0c5f8779663ea1846087a110e7b590 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6af225ae05e1f9f12b17e9d299fc0f6f3c0af97a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 2 18:36:14 2016 -0400
dvdrtools: Drop package
Not supported upstream any more
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit cdae26171d09e2d09dc9fa84f940c10864057f40
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 2 18:06:21 2016 -0400
sane: Drop package
This has no priority right now
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8a909bf4bec3aee5f0b39646481a129d51bd05f9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 2 18:06:01 2016 -0400
hplip: Drop package
Doesn't build and very outdated
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 007f8e5c37d59a878b6598faf36259a15268b41e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 2 18:02:03 2016 -0400
cogl: Fix build
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ee5e4c032ba8b3959a7281fae5f529ca8dbad262
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 2 17:56:40 2016 -0400
texinfo: Fix build
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 215b403d19d98b11d867e089cec8e035db1fd958
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 2 17:48:00 2016 -0400
compat-mpfr: Drop package
This package requires GMP < 6.0 to build which is not
part of our system any more.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b80545fc04dbda2a9c61fe7cbc1dcc49ef9cf835
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 2 17:44:27 2016 -0400
tcpick: Drop package
Project seems to be discontinued
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 7d1a996cc0d3af31f4882f33d80bd5cfed379a61
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 2 17:42:30 2016 -0400
slang: Fix build by removing a file with rpath
This patch also enables two more plugins for slang
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f5e2b33968b2aa04508fa452c5c28dc237050ef5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 2 17:41:58 2016 -0400
bwm-ng: Update to 0.6.1
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b48cd6097ea35fcf5d1c4ec0bfd1cda03cee6c3a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 2 16:29:02 2016 -0400
sip: Honour LDFLAGS
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2374af0b562ae1bd5e566a5b6927e8445852c5df
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 2 16:22:49 2016 -0400
squashfs-tools: Remove package
This is actually very outdated and not very commonly used
any more because it is lacking some features like ACLs.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit bd30175fbbab8c11151807b1ea1f5b79ae1eea9f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 2 15:55:05 2016 -0400
rsyslog: Drop package
This has been replaced by journald
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit cc2bd2f13d1c2be8bf1202c168d5f511461d2987
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 2 15:51:32 2016 -0400
procps: Drop package
This was replaced by procps-ng quite a while ago
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 968ed82c45888b506a317a5f2aef3211a669d157
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 2 14:27:01 2016 -0400
openl2tp: Drop package
This is probably unmaintained upstream and nothing
in IPFire depends on it right now.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b31a2e34db24a9dbe97e8e3378d548677df2a029
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 2 14:15:26 2016 -0400
compat-pcre: Fix running test suite
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 26c49a05889261641be017666044afdf71838616
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 2 14:14:01 2016 -0400
lsof: Cleanup makefile
Make package honour our LDFLAGS
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 1ef5ba3777513d522e6afde1532adf04469b99a4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 2 14:05:53 2016 -0400
libyaml: Fix running test suite
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 141a73ab3808c38969bd23cb3b9a345d6e6a6558
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 2 13:58:48 2016 -0400
libsoup: Fix build
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 67d4db430a8d821e2139010ef0f99cfb76a43941
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 2 13:52:50 2016 -0400
fuse: Update to 2.9.7
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 42e36c7e20829f140654290e7889dcf5ac1af112
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 2 13:51:34 2016 -0400
gsettings-desktop-schemas: Requires intltool >= 0.50.1 to build
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 5b3631798e33e78fcc63a094ba3bbba412f92bbc
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 2 13:49:58 2016 -0400
compat-db: Fix build on aarch64
Some older versions do not have support for aarch64
in configure, yet. Our automatic macro didn't fix that
automatically which requires these lines.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 6eb986e6a397214be0f3aa685f6bb62133068867
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 2 13:40:43 2016 -0400
libmng: Drop package
FTBFS and nothing else depends on it
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
bwm-ng/bwm-ng.nm | 4 +-
cogl/cogl.nm | 4 +-
compat-db/compat-db.nm | 11 +-
compat-mpfr/compat-mpfr.nm | 69 --------
compat-pcre/compat-pcre.nm | 3 +-
dvdrtools/dvdrtools.nm | 41 -----
fuse/fuse.nm | 7 +-
fuse/patches/fuse-2.7.4-openfix.patch | 36 ----
fuse/patches/fuse-2.7.4-udev_rules.patch | 5 -
.../fuse-2.9.2-namespace-conflict-fix.patch | 21 +++
.../gsettings-desktop-schemas.nm | 4 +-
hplip/hplip.nm | 116 -------------
hplip/patches/hplip-3.10.5-udev-rules.patch | 21 ---
libmng/libmng.nm | 55 -------
libsoup/libsoup.nm | 4 +-
libyaml/libyaml.nm | 3 +-
lsof/lsof.nm | 18 +-
openl2tp/openl2tp.nm | 66 --------
procps/patches/procps-3.2.8-selinux.patch | 96 -----------
procps/patches/procps-3.2.8-watch_unicode-2.patch | 148 -----------------
procps/procps.nm | 50 ------
rsyslog/patches/rsyslog-5.7.9-systemd.patch | 14 --
rsyslog/rsyslog.conf | 80 ---------
rsyslog/rsyslog.log | 6 -
rsyslog/rsyslog.nm | 100 -----------
rsyslog/rsyslog.sysconfig | 5 -
sane/patches/sane-1.0.20-lockdir.patch | 30 ----
sane/patches/sane-1.0.21-epson-expression800.patch | 47 ------
sane/patches/sane-1.0.21-i18n.patch | 129 ---------------
sane/patches/sane-1.0.21-pkgconfig.patch | 182 ---------------------
sane/patches/sane-1.0.21-udev.patch | 66 --------
sane/sane.nm | 60 -------
sip/sip.nm | 6 +-
slang/slang.nm | 6 +-
squashfs-tools/patches/squashfs-cflags.patch | 13 --
squashfs-tools/patches/squashfs-xz.patch | 11 --
squashfs-tools/squashfs-tools.nm | 50 ------
tcpick/tcpick.nm | 43 -----
texinfo/texinfo.nm | 3 +-
39 files changed, 65 insertions(+), 1568 deletions(-)
delete mode 100644 compat-mpfr/compat-mpfr.nm
delete mode 100644 dvdrtools/dvdrtools.nm
delete mode 100644 fuse/patches/fuse-2.7.4-openfix.patch
delete mode 100644 fuse/patches/fuse-2.7.4-udev_rules.patch
create mode 100644 fuse/patches/fuse-2.9.2-namespace-conflict-fix.patch
delete mode 100644 hplip/hplip.nm
delete mode 100644 hplip/patches/hplip-3.10.5-udev-rules.patch
delete mode 100644 libmng/libmng.nm
delete mode 100644 openl2tp/openl2tp.nm
delete mode 100644 procps/patches/procps-3.2.8-selinux.patch
delete mode 100644 procps/patches/procps-3.2.8-watch_unicode-2.patch
delete mode 100644 procps/procps.nm
delete mode 100644 rsyslog/patches/rsyslog-5.7.9-systemd.patch
delete mode 100644 rsyslog/rsyslog.conf
delete mode 100644 rsyslog/rsyslog.log
delete mode 100644 rsyslog/rsyslog.nm
delete mode 100644 rsyslog/rsyslog.sysconfig
delete mode 100644 sane/patches/sane-1.0.20-lockdir.patch
delete mode 100644 sane/patches/sane-1.0.21-epson-expression800.patch
delete mode 100644 sane/patches/sane-1.0.21-i18n.patch
delete mode 100644 sane/patches/sane-1.0.21-pkgconfig.patch
delete mode 100644 sane/patches/sane-1.0.21-udev.patch
delete mode 100644 sane/sane.nm
delete mode 100644 squashfs-tools/patches/squashfs-cflags.patch
delete mode 100644 squashfs-tools/patches/squashfs-xz.patch
delete mode 100644 squashfs-tools/squashfs-tools.nm
delete mode 100644 tcpick/tcpick.nm
Difference in files:
diff --git a/bwm-ng/bwm-ng.nm b/bwm-ng/bwm-ng.nm
index 24cdfdd..17e8834 100644
--- a/bwm-ng/bwm-ng.nm
+++ b/bwm-ng/bwm-ng.nm
@@ -4,8 +4,8 @@
###############################################################################
name = bwm-ng
-version = 0.6
-release = 2
+version = 0.6.1
+release = 1
groups = Networking/Statistics
url = http://www.gropp.org/?id=projects&sub=bwm-ng
diff --git a/cogl/cogl.nm b/cogl/cogl.nm
index 3a0f3de..af6285a 100644
--- a/cogl/cogl.nm
+++ b/cogl/cogl.nm
@@ -7,7 +7,7 @@ name = cogl
version = %{ver_maj}.%{ver_min}
ver_maj = 1.13
ver_min = 2
-release = 1
+release = 2
groups = Development/Libraries
url = http://www.clutter-project.org/
@@ -49,6 +49,8 @@ build
pango-devel
end
+ export LD_LIBRARY_PATH = %{DIR_APP}/cogl/.libs:%{DIR_APP}/cogl-pango/.libs
+
configure_options += \
--enable-cairo \
--enable-gdk-pixbuf \
diff --git a/compat-db/compat-db.nm b/compat-db/compat-db.nm
index 6c6c040..6a5f767 100644
--- a/compat-db/compat-db.nm
+++ b/compat-db/compat-db.nm
@@ -6,7 +6,7 @@
name = compat-db
version = %{main_version}
# Release cannot be reset because the sub-packages won't get updated
-release = 7
+release = 8
thisapp = db-%{version}
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
@@ -53,6 +53,15 @@ build
build
for version in %{versions}; do
+ # Fix autotools on aarch64
+ for i in $(find %{DIR_SRC}/db-${version} -name config.guess -or -name config.sub); do
+ if ! grep -q "aarch64" ${i}; then
+ if [ -e "%{datadir}/pakfire/$(basename ${i})" ]; then
+ cp -vf %{datadir}/pakfire/$(basename ${i}) $(dirname ${i})
+ fi
+ fi
+ done
+
cd %{DIR_SRC}/db-${version}/build_unix
../dist/configure \
%{configure_options}
diff --git a/compat-mpfr/compat-mpfr.nm b/compat-mpfr/compat-mpfr.nm
deleted file mode 100644
index d9cfbb6..0000000
--- a/compat-mpfr/compat-mpfr.nm
+++ /dev/null
@@ -1,69 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = compat-mpfr
-version = 2.4.2
-release = 1
-
-thisapp = mpfr-%{version}
-
-groups = System/Libraries
-url = http://www.mpfr.org/
-license = LGPLv2+ and GPLv2+ and GFDL
-summary = A C library for multiple-precision floating-point computations.
-
-description
- The MPFR library is a C library for multiple-precision floating-point
- computations with correct rounding. The MPFR is efficient and
- also has a well-defined semantics. It copies the good ideas from the
- ANSI/IEEE-754 standard for double-precision floating-point arithmetic
- (53-bit mantissa). MPFR is based on the GMP multiple-precision
- library.
-end
-
-source_dl = http://ftp.gnu.org/gnu/mpfr/
-
-build
- requires
- gmp-devel >= 4.3.2
- gmp-devel < 6.0.0
- end
-
- configure_options += \
- --enable-thread-safe \
- --disable-assert
-
- test
- export LD_LIBRARY_PATH=$(pwd)/.libs
- make check
- end
-
- install
- # Only install libraries.
- mkdir -pv %{BUILDROOT}%{libdir}
- install -m 644 .libs/libmpfr.so.1.2.2 %{BUILDROOT}%{libdir}
- ln -svf libmpfr.so.1.2.2 %{BUILDROOT}%{libdir}/libmpfr.so.1
- end
-end
-
-packages
- package %{name}
- provides
- mpfr = %{thisver}
- end
-
- obsoletes
- mpfr-compat
- end
-
- conflicts
- mpfr <= %{thisver}
- end
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/compat-pcre/compat-pcre.nm b/compat-pcre/compat-pcre.nm
index 5251971..259d63f 100644
--- a/compat-pcre/compat-pcre.nm
+++ b/compat-pcre/compat-pcre.nm
@@ -5,7 +5,7 @@
name = compat-pcre
version = 8.21
-release = 1
+release = 2
thisapp = pcre-%{version}
@@ -42,6 +42,7 @@ build
--enable-pcretest-libreadline
test
+ export LD_LIBRARY_PATH=$(pwd)/.libs
make check
end
diff --git a/dvdrtools/dvdrtools.nm b/dvdrtools/dvdrtools.nm
deleted file mode 100644
index efa3490..0000000
--- a/dvdrtools/dvdrtools.nm
+++ /dev/null
@@ -1,41 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = dvdrtools
-version = 0.2.1
-release = 1
-
-groups = System/Filesystems
-url = http://savannah.nongnu.org/projects/dvdrtools/
-license = GPLv2+
-summary = A set of command line programs that allows to record media.
-
-description
- dvdrtools is a fork of cdrtools/cdrecord with support for writing to DVDs. \
- While its primary purpose is writing data DVDs, it includes basic support \
- for mastering video DVDs.
-end
-
-source_dl =
-sources = %{thisapp}.tar.bz2
-
-build
- configure_options += \
- --disable-static \
- --mandir=/usr/share/man
-
- test
- make check
- end
-end
-
-packages
- package %{name}
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/fuse/fuse.nm b/fuse/fuse.nm
index 4974a39..8db4447 100644
--- a/fuse/fuse.nm
+++ b/fuse/fuse.nm
@@ -4,7 +4,7 @@
###############################################################################
name = fuse
-version = 2.8.6
+version = 2.9.7
release = 1
groups = System/Filesystems
@@ -18,15 +18,13 @@ description
FUSE userspace tools to mount a FUSE filesystem.
end
-source_dl = http://downloads.sourceforge.net/project/%{name}/%{name}/%{thisapp}
+source_dl = https://github.com/libfuse/libfuse/releases/download/%{thisapp}/
build
requires
libselinux-devel
end
- CFLAGS += -D_GNU_SOURCE
-
configure_options += \
--disable-static \
--disable-rpath
@@ -42,7 +40,6 @@ end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
diff --git a/fuse/patches/fuse-2.7.4-openfix.patch b/fuse/patches/fuse-2.7.4-openfix.patch
deleted file mode 100644
index e5b9eae..0000000
--- a/fuse/patches/fuse-2.7.4-openfix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up fuse-2.7.2/lib/fuse.c.BAD fuse-2.7.2/lib/fuse.c
---- a/lib/fuse.c 2008-01-21 09:55:42.000000000 -0500
-+++ b/lib/fuse.c 2008-01-21 09:57:20.000000000 -0500
-@@ -633,17 +633,15 @@ static int fuse_compat_open(struct fuse_
- {
- int err;
- if (!fs->compat || fs->compat >= 25)
-- err = fs->op.open(path, fi);
-+ err = (fs->op.open)(path, fi);
- else if (fs->compat == 22) {
- struct fuse_file_info_compat tmp;
- memcpy(&tmp, fi, sizeof(tmp));
-- err = ((struct fuse_operations_compat22 *) &fs->op)->open(path,
-- &tmp);
-+ err = (((struct fuse_operations_compat22 *) &fs->op)->open)(path, &tmp);
- memcpy(fi, &tmp, sizeof(tmp));
- fi->fh = tmp.fh;
- } else
-- err = ((struct fuse_operations_compat2 *) &fs->op)
-- ->open(path, fi->flags);
-+ err = (((struct fuse_operations_compat2 *) &fs->op)->open)(path, fi->flags);
- return err;
- }
-
-diff -up fuse-2.7.2/lib/fuse_lowlevel.c.BAD fuse-2.7.2/lib/fuse_lowlevel.c
---- a/lib/fuse_lowlevel.c 2008-01-21 09:57:52.000000000 -0500
-+++ b/lib/fuse_lowlevel.c 2008-01-21 09:58:15.000000000 -0500
-@@ -605,7 +605,7 @@ static void do_open(fuse_req_t req, fuse
- fi.flags = arg->flags;
-
- if (req->f->op.open)
-- req->f->op.open(req, nodeid, &fi);
-+ (req->f->op.open)(req, nodeid, &fi);
- else
- fuse_reply_open(req, &fi);
- }
diff --git a/fuse/patches/fuse-2.7.4-udev_rules.patch b/fuse/patches/fuse-2.7.4-udev_rules.patch
deleted file mode 100644
index d52fc32..0000000
--- a/fuse/patches/fuse-2.7.4-udev_rules.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- a/util/udev.rules 2005-11-03 19:38:05.000000000 +0100
-+++ b/util/udev.rules 2005-11-03 19:38:13.000000000 +0100
-@@ -1 +1 @@
--KERNEL=="fuse", MODE="0666"
-+KERNEL=="fuse", NAME="%k", MODE="0666",OWNER="root",GROUP="root"
diff --git a/fuse/patches/fuse-2.9.2-namespace-conflict-fix.patch b/fuse/patches/fuse-2.9.2-namespace-conflict-fix.patch
new file mode 100644
index 0000000..ae67e7d
--- /dev/null
+++ b/fuse/patches/fuse-2.9.2-namespace-conflict-fix.patch
@@ -0,0 +1,21 @@
+diff -up fuse-2.9.2/include/fuse_kernel.h.conflictfix fuse-2.9.2/include/fuse_kernel.h
+--- fuse-2.9.2/include/fuse_kernel.h.conflictfix 2013-06-26 09:31:57.862198038 -0400
++++ fuse-2.9.2/include/fuse_kernel.h 2013-06-26 09:32:19.679198365 -0400
+@@ -88,12 +88,16 @@
+ #ifndef _LINUX_FUSE_H
+ #define _LINUX_FUSE_H
+
+-#include <sys/types.h>
++#ifdef __linux__
++#include <linux/types.h>
++#else
++#include <stdint.h>
+ #define __u64 uint64_t
+ #define __s64 int64_t
+ #define __u32 uint32_t
+ #define __s32 int32_t
+ #define __u16 uint16_t
++#endif
+
+ /*
+ * Version negotiation:
diff --git a/gsettings-desktop-schemas/gsettings-desktop-schemas.nm b/gsettings-desktop-schemas/gsettings-desktop-schemas.nm
index 1c28ab6..b7a1a1d 100644
--- a/gsettings-desktop-schemas/gsettings-desktop-schemas.nm
+++ b/gsettings-desktop-schemas/gsettings-desktop-schemas.nm
@@ -7,7 +7,7 @@ name = gsettings-desktop-schemas
version = %{ver_maj}.%{ver_min}
ver_maj = 3.20
ver_min = 0
-release = 1
+release = 2
groups = System/Libraries
url = http://bugzilla.gnome.org/enter_bug.cgi?product=gsettings-desktop-schemas
@@ -26,7 +26,7 @@ build
requires
glib2 >= 2.31.0
gobject-introspection-devel
- intltool
+ intltool >= 0.50.1
end
configure_options += \
diff --git a/hplip/hplip.nm b/hplip/hplip.nm
deleted file mode 100644
index b09973a..0000000
--- a/hplip/hplip.nm
+++ /dev/null
@@ -1,116 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = hplip
-version = 3.10.9
-release = 3
-
-groups = Applications/Printing
-url = http://hplipopensource.com/hplip-web/index.html
-license = GPLv2*
-summary = HP Printer/Scanner Library (full version).
-
-description
- HPLIP (Hewlett-Packard Linux Imaging & Printing) is an HP-developed
- olution for printing, scanning, and faxing with HP inkjet and laser based
- printers in Linux. The HPLIP project provides printing support for 1,924
- printer models.
- This is the full version including printer/scanner support.
-end
-
-source_dl = http://sourceforge.net/projects/%{name}/files/%{name}/%{version}/
-
-build
- requires
- autoconf
- automake
- cups-devel
- dbus-devel
- gcc-c++
- libjpeg-devel
- libtool
- libusb-compat-devel
- net-snmp-devel
- openssl-devel
- pkg-config
- python-devel
- sane-devel
- end
-
- configure_options += \
- --sysconfdir=%{sysconfdir} \
- --disable-gui-build \
- --disable-qt4
-
- install_cmds
- # Remove unwanted files.
- rm -rvf %{BUILDROOT}%{bindir}/hp-systray
- rm -rvf %{BUILDROOT}%{sysconfdir}/sane.d/
- rm -rvf %{BUILDROOT}%{datadir}/installer
-
- # Remove files for HAL.
- rm -rvf %{BUILDROOT}%{datadir}/hal
-
- # Remove X11 relevated files.
- rm -rvf %{BUILDROOT}%{datadir}/applications/
-
- # Remove xdg files.
- rm -rvf %{BUILDROOT}%{sysconfdir}/xdg/
- end
-end
-
-packages
- package %{name}
- requires
- %{name}-common=%{thisver}
- cups
- end
- end
-
- package %{name}-common
- summary = Files needed by the HPLIP printer and scanner drivers.
- description = %{summary}
-
- files
- %{libdir}/udev/
- %{libdir}/python*/
- %{sysconfdir}/udev/
- %{datadir}/hplip
- end
- end
-
- package %{name}-libs
- template LIBS
- end
-
- package %{name}-devel
- template DEVEL
- end
-
- package libsane-hpaio
- summary = SANE driver for scanners in HP's multi-function devices.
- description = %{summary}
-
- prerequires += sane
-
- files
- %{libdir}/sane/*
- end
-
- script postin
- # Add hplip scanner support to sane.
- echo "hpaio" >> %{sysconfdir}/sane.d/dll.conf
- end
-
- script postun
- # Remove hplip scanner support from sane.
- sed -i "/^hpaio$/d" %{sysconfdir}/sane.d/dll.conf
- end
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/hplip/patches/hplip-3.10.5-udev-rules.patch b/hplip/patches/hplip-3.10.5-udev-rules.patch
deleted file mode 100644
index d56fe6c..0000000
--- a/hplip/patches/hplip-3.10.5-udev-rules.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up hplip-3.10.5/data/rules/56-hpmud_support.rules.udev-rules hplip-3.10.5/data/rules/56-hpmud_support.rules
---- hplip-3.10.5/data/rules/56-hpmud_support.rules.udev-rules 2010-05-13 01:44:22.000000000 +0200
-+++ hplip-3.10.5/data/rules/56-hpmud_support.rules 2010-05-17 16:12:42.000000000 +0200
-@@ -6,10 +6,11 @@ SUBSYSTEM!="usb_device", GOTO="hpmud_rul
-
- LABEL="pid_test"
-
-+ENV{ID_USB_INTERFACES}=="", IMPORT{program}="usb_id --export %p"
- # Check for LaserJet products (0x03f0xx17).
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", ENV{hp_model}="$attr{product}", ENV{hp_test}="yes"
- # Check for LaserJet products (0x03f0xx2a).
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??2a", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes"
--ENV{hp_test}=="yes", RUN+="bin/sh -c '/usr/bin/hp-mkuri -c &'"
-+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??2a", ENV{hp_model}="$attr{product}", ENV{hp_test}="yes"
-+ENV{hp_test}=="yes", RUN+="/bin/sh -c '/usr/bin/hp-mkuri -c &'"
-
--LABEL="hpmud_rules_end"
-\ No newline at end of file
-+LABEL="hpmud_rules_end"
-
diff --git a/libmng/libmng.nm b/libmng/libmng.nm
deleted file mode 100644
index 5b0ba8e..0000000
--- a/libmng/libmng.nm
+++ /dev/null
@@ -1,55 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = libmng
-version = 1.0.10
-release = 1
-
-groups = System/Libraries
-url = http://www.libmng.org
-license = zlib
-summary = Library for Multiple-image Network Graphics support.
-
-description
- LibMNG is a library for accessing graphics in MNG (Multi-image Network \
- Graphics) and JNG (JPEG Network Graphics) formats.
-end
-
-source_dl =
-sources = %{thisapp}.tar.bz2
-
-build
- requires
- autoconf
- automake
- libjpeg-devel
- libtool
- zlib-devel
- end
-
- configure_options += \
- --enable-shared \
- --disable-static \
- --with-zlib \
- --with-jpeg \
- --with-gnu-ld
-
- prepare_cmds
- unmaintained/autogen.sh
- end
-end
-
-packages
- package %{name}
- end
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/libsoup/libsoup.nm b/libsoup/libsoup.nm
index 4c2008f..ec16e1b 100644
--- a/libsoup/libsoup.nm
+++ b/libsoup/libsoup.nm
@@ -7,7 +7,7 @@ name = libsoup
version = %{ver_major}.%{ver_minor}
ver_major = 2.54
ver_minor = 0.1
-release = 1
+release = 2
groups = System/Libraries
url = http://live.gnome.org/LibSoup
@@ -38,6 +38,8 @@ build
vala-devel >= 0.32
end
+ export LD_LIBRARY_PATH = %{DIR_APP}/libsoup/.libs
+
configure_options += \
--enable-introspection=yes \
--disable-tls-check \
diff --git a/libyaml/libyaml.nm b/libyaml/libyaml.nm
index f945f23..6a07ec8 100644
--- a/libyaml/libyaml.nm
+++ b/libyaml/libyaml.nm
@@ -5,7 +5,7 @@
name = libyaml
version = 0.1.3
-release = 1
+release = 2
groups = System/Libraries
url = http://pyyaml.org/
@@ -25,6 +25,7 @@ build
DIR_APP = %{DIR_SRC}/yaml-%{version}
test
+ export LD_LIBRARY_PATH=$(pwd)/src/.libs
make check
end
end
diff --git a/lsof/lsof.nm b/lsof/lsof.nm
index b10421c..6b8a022 100644
--- a/lsof/lsof.nm
+++ b/lsof/lsof.nm
@@ -5,7 +5,7 @@
name = lsof
version = 4.85
-release = 1
+release = 2
groups = Development/Debuggers
url = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/
@@ -25,18 +25,18 @@ build
libselinux-devel
end
+ export LSOF_CFGL = %{CFLAGS} %{LDFLAGS}
+
build
- LINUX_BASE=/proc \
- LSOF_VSTR="2.6.16" \
- ./Configure linux -n
- make DEBUG="%{CFLAGS}" %{PARALLELISMFLAGS}
+ ./Configure -n linux
+ make %{PARALLELISMFLAGS}
end
install
- mkdir -pv %{BUILDROOT}/usr/sbin
- install -m 755 lsof %{BUILDROOT}/usr/sbin
- mkdir -pv %{BUILDROOT}/usr/share/man/man8
- cp -vf lsof.8 %{BUILDROOT}/usr/share/man/man8
+ mkdir -pv %{BUILDROOT}%{sbindir}
+ install -m 755 lsof %{BUILDROOT}%{sbindir}
+ mkdir -pv %{BUILDROOT}%{mandir}/man8
+ cp -vf lsof.8 %{BUILDROOT}%{mandir}/man8
end
end
diff --git a/openl2tp/openl2tp.nm b/openl2tp/openl2tp.nm
deleted file mode 100644
index 354edb2..0000000
--- a/openl2tp/openl2tp.nm
+++ /dev/null
@@ -1,66 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = openl2tp
-version = 1.7
-release = 2
-
-groups = Networking/PPP
-url = http://www.openl2tp.org/
-license = GPL
-summary = A Linux L2TP solution for enterprise VPN and ISPs.
-
-description
- OpenL2TP is an open source L2TP client / server, written specifically
- for Linux. It has been designed for use as an enterprise L2TP VPN
- server or in commercial, Linux-based, embedded networking products and
- is able to support hundreds of sessions, each with different
- configuration. It is used by several ISPs to provide L2TP services and
- by corporations to implement L2TP VPNs.
-end
-
-source_dl =
-
-build
- requires
- bison
- flex
- flex-devel
- readline-devel
- tcl
- end
-
- CFLAGS += -fno-strict-aliasing
-
- prepare_cmds
- sed -e "s/-lfl/&_pic/g" -i Makefile
-
- # Remove -Werror from all makefiles.
- find . -name Makefile | xargs sed -i -e "s/-Werror//g"
- end
-
- build
- make OPT_CFLAGS="%{CFLAGS}" ARCH="%{DISTRO_ARCH}" \
- KERNEL_SRCDIR="/usr" PPPD_VERSION="2.4.5"
- end
-
-# This doesn't really a good testing
-#define test
-# cd %{DIR_APP} && make test
-#endef
-
- install
- make install DESTDIR=%{BUILDROOT} ARCH="%{DISTRO_ARCH}" \
- KERNEL_SRCDIR="/usr" PPPD_VERSION="2.4.5"
- end
-end
-
-packages
- package %{name}
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/procps/patches/procps-3.2.8-selinux.patch b/procps/patches/procps-3.2.8-selinux.patch
deleted file mode 100644
index a8c1f74..0000000
--- a/procps/patches/procps-3.2.8-selinux.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 09fb3ed..4d05900 100644
---- a/Makefile
-+++ b/Makefile
-@@ -73,12 +73,12 @@ CURSES := -lncurses
- # Something like this is probably needed to make the SE Linux
- # library loading not conflict with embedded systems stuff.
- #
--#ifeq ($(SHARED),1)
--#ldl := -ldl
--#LIBTYPE := -DSHAREDLIB
--#else
--#LIBTYPE := -DSTATICLIB
--#endif
-+ifeq ($(SHARED),1)
-+ldl := -ldl
-+LIBTYPE := -DSHAREDLIB
-+else
-+LIBTYPE := -DSTATICLIB
-+endif
-
- # Preprocessor flags.
- PKG_CPPFLAGS := -D_GNU_SOURCE -I proc
-@@ -103,7 +103,7 @@ PKG_CFLAGS := -fno-common -ffast-math \
- # Note that some stuff below is conditional on CFLAGS containing
- # an option that starts with "-g". (-g, -g2, -g3, -ggdb, etc.)
- CFLAGS := -O2 -s
--ALL_CFLAGS := $(PKG_CFLAGS) $(CFLAGS)
-+ALL_CFLAGS := $(PKG_CFLAGS) $(CFLAGS) $(LIBTYPE)
-
- PKG_LDFLAGS := -Wl,-warn-common
- LDFLAGS :=
-diff --git a/ps/output.c b/ps/output.c
-index 87bf9de..edbb4cb 100644
---- a/ps/output.c
-+++ b/ps/output.c
-@@ -1099,7 +1099,7 @@ static int pr_sgi_p(char *restrict const outbuf, const proc_t *restrict const pp
- return snprintf(outbuf, COLWID, "*");
- }
-
--
-+#ifdef STATICLIB
- /****************** FLASK & seLinux security stuff **********************/
- // move the bulk of this to libproc sometime
-
-@@ -1131,7 +1131,7 @@ fail:
- return 1;
- }
-
--#if 0
-+#else
- // This needs more study, considering:
- // 1. the static linking option (maybe disable this in that case)
- // 2. the -z and -Z option issue
-diff --git a/ps/parser.c b/ps/parser.c
-index 5ad9035..2659d4d 100644
---- a/ps/parser.c
-+++ b/ps/parser.c
-@@ -231,7 +231,7 @@ static const char *parse_sysv_option(void){
- // In the meantime, please do not add to it. The list is
- // intended to ONLY contain flags defined by the POSIX and UNIX
- // standards published by The Open Group, IEEE, and ISO.
-- if(!strchr("aAdefgGlnoptuU", *flagptr)) not_pure_unix = 1; // dude, -Z ain't in POSIX
-+ if(!strchr("aAdefgGlnoptuUZ", *flagptr)) not_pure_unix = 1; // dude, -Z ain't in POSIX
-
- switch(*flagptr){
- case 'A':
-diff --git a/ps/ps.1 b/ps/ps.1
-index 64953d5..aab2584 100644
---- a/ps/ps.1
-+++ b/ps/ps.1
-@@ -450,6 +450,9 @@ display virtual memory format
- Do not show flags; show rss in place of addr.
- This option can only be used with \fB\-l\fR.
-
-+.opt \-Z
-+display security context format (SELinux, etc.)
-+
- .opt \-\-format \ format
- user\-defined format. Identical to \fB\-o\fR and \fBo\fR.
-
-diff --git a/w.c b/w.c
-index 1b2a0fc..207a8a1 100644
---- a/w.c
-+++ b/w.c
-@@ -163,6 +163,10 @@ static const proc_t *getproc(const utmp_t *restrict const u, const char *restric
- if(best && tmp->start_time <= best->start_time) continue;
- best = tmp;
- }
-+ /* It is there but SELinux wouldn't allow us to know the detail. Really
-+ w should just be given rights */
-+ if(!kill(u->ut_pid, 0) || errno != ESRCH)
-+ *found_utpid = 1;
- return best ? best : secondbest;
- }
-
diff --git a/procps/patches/procps-3.2.8-watch_unicode-2.patch b/procps/patches/procps-3.2.8-watch_unicode-2.patch
deleted file mode 100644
index bfc78d3..0000000
--- a/procps/patches/procps-3.2.8-watch_unicode-2.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-Submitted By: Matt Burgess <matthew_at_linuxfromscratch_dot_org>
-Date: 2009-05-11
-Initial Package Version: 3.2.8
-Upstream Status: Submitted
-Origin: http://wiki.linuxfromscratch.org/lfs/ticket/2113
-Description: Fixes a unicode related bug in the watch program
-
-diff -Naur procps-3.2.8.orig/Makefile procps-3.2.8/Makefile
---- procps-3.2.8.orig/Makefile 2009-05-10 18:50:48.000000000 +0000
-+++ procps-3.2.8/Makefile 2009-05-12 19:06:50.000000000 +0000
-@@ -67,7 +67,7 @@
- # plus the top-level Makefile to make it work stand-alone.
- _TARFILES := Makefile
-
--CURSES := -lncurses
-+CURSES := -lncursesw
-
- # This seems about right for the dynamic library stuff.
- # Something like this is probably needed to make the SE Linux
-diff -Naur procps-3.2.8.orig/watch.c procps-3.2.8/watch.c
---- procps-3.2.8.orig/watch.c 2007-05-28 03:13:23.000000000 +0000
-+++ procps-3.2.8/watch.c 2009-05-12 19:17:25.000000000 +0000
-@@ -25,6 +25,8 @@
- #include <termios.h>
- #include <locale.h>
- #include "proc/procps.h"
-+#include <wchar.h>
-+#include <wctype.h>
-
- #ifdef FORCE_8BIT
- #undef isprint
-@@ -134,6 +136,27 @@
- }
- }
-
-+static wint_t
-+readwc(FILE *stream, mbstate_t *mbs)
-+{
-+ for (;;) {
-+ int chr;
-+ char c;
-+ wchar_t wc;
-+ size_t len;
-+
-+ chr = getc(stream);
-+ if (chr == EOF)
-+ return WEOF;
-+ c = chr;
-+ len = mbrtowc(&wc, &c, 1, mbs);
-+ if (len == (size_t)-1)
-+ memset(mbs, 0, sizeof(*mbs));
-+ else if (len != (size_t)-2)
-+ return wc;
-+ }
-+}
-+
- int
- main(int argc, char *argv[])
- {
-@@ -239,6 +262,7 @@
- FILE *p;
- int x, y;
- int oldeolseen = 1;
-+ mbstate_t mbs;
-
- if (screen_size_changed) {
- get_terminal_size();
-@@ -266,49 +290,65 @@
- do_exit(2);
- }
-
-+ memset(&mbs, 0, sizeof(mbs));
- for (y = show_title; y < height; y++) {
- int eolseen = 0, tabpending = 0;
- for (x = 0; x < width; x++) {
-- int c = ' ';
-- int attr = 0;
-+ wint_t c = L' ';
-+ int attr = 0, c_width;
-+ cchar_t cc;
-+ wchar_t wstr[2];
-
- if (!eolseen) {
- /* if there is a tab pending, just spit spaces until the
- next stop instead of reading characters */
- if (!tabpending)
- do
-- c = getc(p);
-- while (c != EOF && !isprint(c)
-- && c != '\n'
-- && c != '\t');
-- if (c == '\n')
-+ c = readwc(p, &mbs);
-+ while (c != WEOF && !iswprint(c)
-+ && c != L'\n'
-+ && c != L'\t');
-+ if (c == L'\n')
- if (!oldeolseen && x == 0) {
- x = -1;
- continue;
- } else
- eolseen = 1;
-- else if (c == '\t')
-+ else if (c == L'\t')
- tabpending = 1;
-- if (c == EOF || c == '\n' || c == '\t')
-- c = ' ';
-+ if (c == WEOF || c == L'\n' || c == L'\t')
-+ c = L' ';
- if (tabpending && (((x + 1) % 8) == 0))
- tabpending = 0;
- }
-+ wstr[0] = c;
-+ wstr[1] = 0;
-+ setcchar (&cc, wstr, 0, 0, NULL);
- move(y, x);
- if (option_differences) {
-- chtype oldch = inch();
-- char oldc = oldch & A_CHARTEXT;
-+ cchar_t oldc;
-+ wchar_t oldwstr[2];
-+ attr_t attrs;
-+ short colors;
-+
-+ in_wch(&oldc);
-+ getcchar(&oldc, oldwstr, &attrs, &colors, NULL);
- attr = !first_screen
-- && ((char)c != oldc
-+ && (wstr[0] != oldwstr[0]
- ||
- (option_differences_cumulative
-- && (oldch & A_ATTRIBUTES)));
-+ && attrs));
- }
- if (attr)
- standout();
-- addch(c);
-+ add_wch(&cc);
-+
- if (attr)
- standend();
-+ c_width = wcwidth(c);
-+ if (c_width > 1)
-+ x += c_width - 1;
-+
- }
- oldeolseen = eolseen;
- }
diff --git a/procps/procps.nm b/procps/procps.nm
deleted file mode 100644
index 817a4f1..0000000
--- a/procps/procps.nm
+++ /dev/null
@@ -1,50 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = procps
-version = 3.2.8
-release = 4
-
-groups = Applications/System
-url = http://procps.sourceforge.net/
-license = GPLv2+ and LGPLv2+
-summary = System and process monitoring utilities.
-
-description
- The procps package contains a set of system utilities that provide
- system information. Procps includes ps, free, skill, pkill, pgrep,
- snice, tload, top, uptime, vmstat, w, watch and pdwx.
-end
-
-source_dl =
-
-build
- requires
- libselinux-devel
- ncurses-devel
- end
-
- make_build_targets += \
- SHARED=1 \
- CFLAGS="%{CFLAGS}" \
- W_SHOWFROM=-DW_SHOWFROM
-
- make_install_targets += \
- SKIP="/bin/kill /usr/share/man/man1/kill.1"
-
- install_cmds
- chmod -R 755 %{BUILDROOT}/{bin,%{lib},sbin}
- end
-end
-
-packages
- package %{name}
- groups += Base
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/rsyslog/patches/rsyslog-5.7.9-systemd.patch b/rsyslog/patches/rsyslog-5.7.9-systemd.patch
deleted file mode 100644
index 1049c31..0000000
--- a/rsyslog/patches/rsyslog-5.7.9-systemd.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up rsyslog-5.7.9/rsyslog.service.in.orig rsyslog-5.7.9/rsyslog.service.in
---- rsyslog-5.7.9/rsyslog.service.in.orig 2011-03-18 18:05:58.760693398 +0100
-+++ rsyslog-5.7.9/rsyslog.service.in 2011-03-18 18:07:20.131691458 +0100
-@@ -2,8 +2,9 @@
- Description=System Logging Service
-
- [Service]
-+EnvironmentFile=-/etc/sysconfig/rsyslog
- ExecStartPre=/bin/systemctl stop systemd-kmsg-syslogd.service
--ExecStart=@sbindir@/rsyslogd -n -c5
-+ExecStart=@sbindir@/rsyslogd -n $SYSLOGD_OPTIONS
- Sockets=syslog.socket
-
- [Install]
diff --git a/rsyslog/rsyslog.conf b/rsyslog/rsyslog.conf
deleted file mode 100644
index 36cea98..0000000
--- a/rsyslog/rsyslog.conf
+++ /dev/null
@@ -1,80 +0,0 @@
-# rsyslog v5 configuration file
-
-# For more information see /usr/share/doc/rsyslog-*/rsyslog_conf.html
-# If you experience problems, see http://www.rsyslog.com/doc/troubleshoot.html
-
-#### MODULES ####
-
-$ModLoad imuxsock # provides support for local system logging (e.g. via logger command)
-$ModLoad imklog # provides kernel logging support (previously done by rklogd)
-#$ModLoad immark # provides --MARK-- message capability
-
-# Provides UDP syslog reception
-#$ModLoad imudp
-#$UDPServerRun 514
-
-# Provides TCP syslog reception
-#$ModLoad imtcp
-#$InputTCPServerRun 514
-
-
-#### GLOBAL DIRECTIVES ####
-
-# Use default timestamp format
-$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
-
-# File syncing capability is disabled by default. This feature is usually not required,
-# not useful and an extreme performance hit
-#$ActionFileEnableSync on
-
-# Include all config files in /etc/rsyslog.d/
-$IncludeConfig /etc/rsyslog.d/*.conf
-
-
-#### RULES ####
-
-# Log all kernel messages to the console.
-# Logging much else clutters up the screen.
-#kern.* /dev/console
-
-# Log anything (except mail) of level info or higher.
-# Don't log private authentication messages!
-*.info;mail.none;authpriv.none;cron.none /var/log/messages
-
-# The authpriv file has restricted access.
-authpriv.* /var/log/secure
-
-# Log all the mail messages in one place.
-mail.* -/var/log/maillog
-
-
-# Log cron stuff
-cron.* /var/log/cron
-
-# Everybody gets emergency messages
-*.emerg *
-
-# Save news errors of level crit and higher in a special file.
-uucp,news.crit /var/log/spooler
-
-# Save boot messages also to boot.log
-local7.* /var/log/boot.log
-
-
-# ### begin forwarding rule ###
-# The statement between the begin ... end define a SINGLE forwarding
-# rule. They belong together, do NOT split them. If you create multiple
-# forwarding rules, duplicate the whole block!
-# Remote Logging (we use TCP for reliable delivery)
-#
-# An on-disk queue is created for this action. If the remote host is
-# down, messages are spooled to disk and sent when it is up again.
-#$WorkDirectory /var/lib/rsyslog # where to place spool files
-#$ActionQueueFileName fwdRule1 # unique name prefix for spool files
-#$ActionQueueMaxDiskSpace 1g # 1gb space limit (use as much as possible)
-#$ActionQueueSaveOnShutdown on # save messages to disk on shutdown
-#$ActionQueueType LinkedList # run asynchronously
-#$ActionResumeRetryCount -1 # infinite retries if host is down
-# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional
-#*.* @@remote-host:514
-# ### end of the forwarding rule ###
diff --git a/rsyslog/rsyslog.log b/rsyslog/rsyslog.log
deleted file mode 100644
index 674e9d0..0000000
--- a/rsyslog/rsyslog.log
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/log/messages /var/log/secure /var/log/maillog /var/log/spooler /var/log/cron {
- sharedscripts
- postrotate
- /bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true
- endscript
-}
diff --git a/rsyslog/rsyslog.nm b/rsyslog/rsyslog.nm
deleted file mode 100644
index 1956a38..0000000
--- a/rsyslog/rsyslog.nm
+++ /dev/null
@@ -1,100 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = rsyslog
-version = 5.8.6
-release = 4
-
-groups = System/Daemons
-url = http://www.rsyslog.com/
-license = GPLv3+
-summary = Enhanced system logging and kernel message trapping daemon.
-
-description
- Rsyslog is an enhanced, multi-threaded syslog daemon. It supports MySQL,
- syslog/TCP, RFC 3195, permitted sender lists, filtering on any message part,
- and fine grain output format control. It is compatible with stock sysklogd
- and can be used as a drop-in replacement. Rsyslog is simple to set up, with
- advanced features suitable for enterprise-class, encryption-protected syslog
- relay chains.
-end
-
-source_dl = http://www.rsyslog.com/files/download/rsyslog/
-
-build
- requires
- gnutls-devel
- libgcrypt-devel
- libnet-devel
- zlib-devel
- end
-
- CFLAGS += \
- -DSYSLOGD_PIDNAME=\"syslogd.pid\"
-
- configure_options += \
- --with-systemdsystemunitdir=/lib/systemd/system \
- --disable-static \
- --disable-testbench \
- --enable-gnutls \
- --disable-gssapi-krb5 \
- --enable-imfile \
- --disable-libdbi \
- --enable-mail \
- --disable-mysql \
- --enable-omprog \
- --enable-omudpspoof \
- --enable-omuxsock \
- --disable-pgsql \
- --enable-pmlastmsg \
- --disable-relp \
- --disable-snmp \
- --enable-unlimited-select
-
- install_cmds
- mkdir -pv %{BUILDROOT}/etc/{logrotate.d,rsyslog.d,sysconfig}
-
- cp -vf %{DIR_SOURCE}/rsyslog.conf %{BUILDROOT}/etc/rsyslog.conf
- cp -vf %{DIR_SOURCE}/rsyslog.sysconfig %{BUILDROOT}/etc/sysconfig/rsyslog
- cp -vf %{DIR_SOURCE}/rsyslog.log %{BUILDROOT}/etc/logrotate.d/syslog
- end
-end
-
-packages
- package %{name}
- requires = logrotate
- provides += syslog
-
- prerequires = systemd-units
-
- script postin
- for n in /var/log/{messages,secure,maillog,spooler}; do
- [ -f "${n}" ] && continue
- umask 066 && touch ${n}
- done
- end
-
- script preun
- /bin/systemctl --no-reload disable rsyslog.service >/dev/null 2>&1 || :
- /bin/systemctl stop rsyslog.service 2>&1 || :
- end
-
- script postun
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
- end
-
- # Disable and stop rsyslog after update, because we use the
- # journal daemon from systemd from now.
- script postup
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
- /bin/systemctl disable rsyslog.service >/dev/null 2>&1 || :
- /bin/systemctl stop rsyslog.service >/dev/null 2>&1 || :
- end
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/rsyslog/rsyslog.sysconfig b/rsyslog/rsyslog.sysconfig
deleted file mode 100644
index ad9723f..0000000
--- a/rsyslog/rsyslog.sysconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-# Options for rsyslogd
-# Syslogd options are deprecated since rsyslog v3.
-# If you want to use them, switch to compatibility mode 2 by "-c 2"
-# See rsyslogd(8) for more details
-SYSLOGD_OPTIONS="-c 5"
diff --git a/sane/patches/sane-1.0.20-lockdir.patch b/sane/patches/sane-1.0.20-lockdir.patch
deleted file mode 100644
index 8839976..0000000
--- a/sane/patches/sane-1.0.20-lockdir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 1e12605eac293b12809ca2933622acc54515c237
-Author: Nils Philippsen <nils(a)redhat.com>
-Date: Mon Dec 28 17:00:25 2009 +0100
-
- patch: lockdir
-
- Squashed commit of the following:
-
- commit 7d26ebc2c0c0c8a8e3254834a700951b49648eeb
- Author: Nils Philippsen <nils(a)redhat.com>
- Date: Mon Dec 28 16:58:36 2009 +0100
-
- improve install-lockpath target
-
- make robust against problems with setting group on sane lock dir
-
-diff --git a/backend/Makefile.am b/backend/Makefile.am
-index 5165423..3c22cd4 100644
---- a/backend/Makefile.am
-+++ b/backend/Makefile.am
-@@ -137,7 +137,8 @@ install-firmware-path:
- done
-
- install-lockpath:
-- $(mkinstalldirs) -m 775 -g $(LOCKPATH_GROUP) $(DESTDIR)$(locksanedir)
-+ $(mkinstalldirs) -m 775 -g $(LOCKPATH_GROUP) $(DESTDIR)$(locksanedir) || \
-+ $(mkinstalldirs) -m 775 $(DESTDIR)$(locksanedir)
-
- uninstall-hook:
- rm -rf $(DESTDIR)$(libdir)/sane $(DESTDIR)$(configdir) $(DESTDIR)$(locksanedir)
diff --git a/sane/patches/sane-1.0.21-epson-expression800.patch b/sane/patches/sane-1.0.21-epson-expression800.patch
deleted file mode 100644
index 8a6fb5d..0000000
--- a/sane/patches/sane-1.0.21-epson-expression800.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 305535e303032814b65bf6d889a95f00f08a9071 Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils(a)redhat.com>
-Date: Wed, 5 May 2010 12:49:02 +0200
-Subject: [PATCH] patch: epson-expression800
-
-Squashed commit of the following:
-
-commit 3b501d7499357438a1fbd63fefb2f977ae3051f5
-Author: Nils Philippsen <nils(a)redhat.com>
-Date: Wed May 5 12:14:23 2010 +0200
-
- Improve Epson Expression 800
-
- Epson Expression 800 models announce themselves as "processor", not
- "scanner".
----
- doc/descriptions/epson.desc | 1 +
- doc/descriptions/epson2.desc | 1 +
- 2 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/doc/descriptions/epson.desc b/doc/descriptions/epson.desc
-index a22325c..55a0136 100644
---- a/doc/descriptions/epson.desc
-+++ b/doc/descriptions/epson.desc
-@@ -174,6 +174,7 @@
- :model "Expression 800"
- :interface "SCSI"
- :status :complete
-+:scsi "EPSON" "Expression800" "processor"
-
- :model "Expression 1600"
- :interface "SCSI USB IEEE-1394"
-diff --git a/doc/descriptions/epson2.desc b/doc/descriptions/epson2.desc
-index 9a14f4f..56cabcd 100644
---- a/doc/descriptions/epson2.desc
-+++ b/doc/descriptions/epson2.desc
-@@ -241,6 +241,7 @@
- :model "Expression 800" ; command spec
- :interface "SCSI"
- :status :complete
-+:scsi "EPSON" "Expression800" "processor"
- :comment "overseas version of the GT-9600"
-
- :model "Expression 836XL" ; command spec
---
-1.6.6.1
-
diff --git a/sane/patches/sane-1.0.21-i18n.patch b/sane/patches/sane-1.0.21-i18n.patch
deleted file mode 100644
index ae00d9a..0000000
--- a/sane/patches/sane-1.0.21-i18n.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-diff -Nur sane-backends-1.0.21/po/LINGUAS sane-backends-1.0.21.mod/po/LINGUAS
---- sane-backends-1.0.21/po/LINGUAS 1969-12-31 19:00:00.000000000 -0500
-+++ sane-backends-1.0.21.mod/po/LINGUAS 2010-04-27 03:38:23.000000000 -0400
-@@ -0,0 +1,21 @@
-+# List of languages
-+# try to keep this list ordered
-+bg
-+cs
-+da
-+de
-+en_GB
-+eo
-+es
-+fi
-+fr
-+gl
-+it
-+ja
-+nb
-+nl
-+pl
-+pt
-+ru
-+sv
-+uk
-diff -Nur sane-backends-1.0.21/po/POTFILES sane-backends-1.0.21.mod/po/POTFILES
---- sane-backends-1.0.21/po/POTFILES 1969-12-31 19:00:00.000000000 -0500
-+++ sane-backends-1.0.21.mod/po/POTFILES 2010-04-27 03:38:16.000000000 -0400
-@@ -0,0 +1,100 @@
-+# List of source files containing translatable strings
-+# paths relative to po
-+../include/sane/saneopts.h
-+../backend/sane_strstatus.c
-+
-+../backend/artec_eplus48u.c
-+
-+../backend/avision.h
-+
-+../backend/canon630u.c
-+../backend/canon.c
-+../backend/canon-sane.c
-+
-+../backend/canon_dr.c
-+../backend/canon_dr.h
-+
-+../backend/cardscan.c
-+../backend/cardscan.h
-+
-+../backend/epjitsu.c
-+../backend/epjitsu.h
-+
-+../backend/epson.c
-+../backend/epson.h
-+../backend/epson2.c
-+../backend/epson2.h
-+
-+../backend/fujitsu.c
-+../backend/fujitsu.h
-+
-+../backend/genesys.c
-+
-+../backend/kodak.c
-+../backend/kodak.h
-+
-+../backend/gt68xx.c
-+../backend/gt68xx_low.h
-+
-+../backend/hp3500.c
-+../backend/hp3900_sane.c
-+../backend/hp5400_sane.c
-+../backend/hp5590.c
-+../backend/hp-option.c
-+../backend/hp-option.h
-+
-+../backend/leo.c
-+../backend/leo.h
-+
-+../backend/lexmark.c
-+
-+../backend/ma1509.c
-+
-+../backend/matsushita.c
-+../backend/matsushita.h
-+
-+../backend/microtek2.c
-+../backend/microtek2.h
-+
-+../backend/mustek.c
-+../backend/mustek_usb.c
-+../backend/mustek_usb2.c
-+
-+../backend/niash.c
-+
-+../backend/pixma.c
-+../backend/pixma_sane_options.c
-+
-+../backend/plustek.c
-+../backend/plustek_pp.c
-+
-+../backend/pnm.c
-+
-+../backend/rts8891.c
-+
-+../backend/sceptre.c
-+../backend/sceptre.h
-+
-+../backend/sm3840.c
-+
-+../backend/snapscan.c
-+../backend/snapscan-options.c
-+
-+../backend/stv680.c
-+../backend/stv680.h
-+
-+../backend/teco1.c
-+../backend/teco1.h
-+../backend/teco2.c
-+../backend/teco2.h
-+../backend/teco3.c
-+../backend/teco3.h
-+
-+../backend/test.c
-+
-+../backend/u12.c
-+
-+../backend/umax1220u.c
-+../backend/umax.c
-+../backend/umax_pp.c
-+
diff --git a/sane/patches/sane-1.0.21-pkgconfig.patch b/sane/patches/sane-1.0.21-pkgconfig.patch
deleted file mode 100644
index 17fa04a..0000000
--- a/sane/patches/sane-1.0.21-pkgconfig.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-From de99bb00b0084e8a1862398270278a14e099b22b Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils(a)redhat.com>
-Date: Wed, 5 May 2010 13:23:40 +0200
-Subject: [PATCH] patch: pkgconfig
-
-Squashed commit of the following:
-
-commit d615848c499842c5923c3274370d2536dc650916
-Author: Nils Philippsen <nils(a)redhat.com>
-Date: Fri Feb 26 17:51:14 2010 +0100
-
- pkgconfig file is data
- (cherry picked from commit 1f0e85c705a42c7e6ccd938eaad69f531c63f63d)
-
- Signed-off-by: Nils Philippsen <nils(a)redhat.com>
-
-commit 119d5af1ddd82dac034d0106a1d86b6d7564f25e
-Author: Nils Philippsen <nils(a)redhat.com>
-Date: Wed Jun 17 13:09:51 2009 +0200
-
- make sane-config multilib-aware on Linux
- (cherry picked from commit 52ef5f47ccc0128c78ab3ad38ac7b7918dd7ac88)
-
- Signed-off-by: Nils Philippsen <nils(a)redhat.com>
-
-commit 7ee1cbef01d851aca95d86145ac5dda02d9e7354
-Author: Nils Philippsen <nils(a)redhat.com>
-Date: Wed May 5 10:22:15 2010 +0200
-
- use pkg-config in sane-config
----
- tools/Makefile.am | 14 ++++++++++-
- tools/sane-config.in | 66 ++++++++++++++++++++++++++++++++++++++-----------
- 2 files changed, 64 insertions(+), 16 deletions(-)
-
-diff --git a/tools/Makefile.am b/tools/Makefile.am
-index f52a39a..ab4e1b7 100644
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -7,6 +7,10 @@
- AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include \
- -I$(top_srcdir)/include
-
-+SUFFIXES = .pc.in .pc
-+
-+pkgconfigdir = ${libdir}/pkgconfig
-+
- bin_PROGRAMS = sane-find-scanner gamma4scanimage
- noinst_PROGRAMS = sane-desc umax_pp
-
-@@ -26,8 +30,14 @@ noinst_SCRIPTS = $(HOTPLUG)
- BUILT_SOURCES = $(HOTPLUG_DIR)
- CLEANFILES = $(bin_SCRIPTS) $(dist_noinst_SCRIPTS)
-
-+pkgconfig_DATA = sane-backends.pc
-+
-+.pc.in.pc:
-+ cd $(top_builddir) \
-+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+
- EXTRA_DIST = check-po.awk libtool-get-dll-ext mustek600iin-off.c \
-- RenSaneDlls.cmd README xerox
-+ RenSaneDlls.cmd README xerox sane-backends.pc.in
-
- sane_find_scanner_SOURCES = sane-find-scanner.c check-usb-chip.c \
- ../backend/sane_strstatus.c
-@@ -72,5 +82,7 @@ hal/libsane.fdi: $(wildcard ${top_srcdir}/doc/descriptions/*.desc) $(wildcard ${
- @./sane-desc -m hal -s ${top_srcdir}/doc/descriptions:${top_srcdir}/doc/descriptions-external \
- -d 0 > $@
-
-+sane-backends.pc: $(top_builddir)/config.status
-+
- clean-local:
- rm -f $(HOTPLUG)
-diff --git a/tools/sane-config.in b/tools/sane-config.in
-index 22c02b5..a9ce6fb 100644
---- a/tools/sane-config.in
-+++ b/tools/sane-config.in
-@@ -19,7 +19,7 @@ pkglibdir="@pkglibdir@"
- includedir="@includedir@"
- mandir="@mandir@"
- infodir="@infodir@"
--libdir="@libdir@"
-+#libdir=
- localstatedir="@localstatedir@"
- sysconfdir="@sysconfdir@"
- datarootdir="@datarootdir@"
-@@ -33,6 +33,30 @@ srcdir="@srcdir@"
- top_srcdir="@top_srcdir@"
- cflags=
-
-+pkgconfig_package=sane-backends
-+use_pkgconfig=0
-+if test -x "@bindir@/pkg-config" && "@bindir@/pkg-config" --exists "$pkgconfig_package"; then
-+ use_pkgconfig=1
-+else
-+ libdir=
-+ if kernel="`uname -s 2>/dev/null`"; then
-+ case "$kernel" in
-+ Linux)
-+ if hw="`uname -i 2>/dev/null`"; then
-+ case "$hw" in
-+ *64)
-+ libdir="@exec_prefix@/lib64"
-+ ;;
-+ esac
-+ fi
-+ ;;
-+ esac
-+ fi
-+ if test "x$libdir" = "x"; then
-+ libdir="@exec_prefix@/lib"
-+ fi
-+fi
-+
- usage ()
- {
- echo "Usage: " 1>&2
-@@ -60,7 +84,7 @@ if test $# -gt 0; then
- if test $# -eq 1; then
- usage
- elif test $# -eq 2; then
-- case $2 in
-+ case $2 in
- --cflags)
- echo "Usage: $0 --cflags"
- echo " Print C compiler flags for compiling code that uses SANE."
-@@ -86,26 +110,38 @@ if test $# -gt 0; then
- ;;
- --ldflags)
-
-- if test -z "$LINKER_RPATH"; then
-- echo "-L${libdir} @LDFLAGS@"
-+ if test "x$use_pkgconfig" = "x0"; then
-+ if test -z "$LINKER_RPATH"; then
-+ echo "-L${libdir} @LDFLAGS@"
-+ else
-+ echo "-L${libdir} @LDFLAGS@ ${LINKER_RPATH}${libdir}"
-+ fi
- else
-- echo "-L${libdir} @LDFLAGS@ ${LINKER_RPATH}${libdir}"
-+ pkg-config --libs-only-L "$pkgconfig_package"
- fi
- ;;
- --libs)
-- echo "-lsane ${LIBS}"
-+ if test "x$use_pkgconfig" = "x0"; then
-+ echo "-lsane ${LIBS}"
-+ else
-+ pkg-config --libs "$pkgconfig_package"
-+ fi
- ;;
- --cflags)
-- unique_cflags=
-- if test "${includedir}" != "/usr/include"; then
-- unique_cflags="${unique_cflags} -I${includedir}"
-- fi
-- for i in $cflags; do
-- if test "${i}" != "-I${includedir}"; then
-- unique_cflags="${unique_cflags} $i"
-+ if test "x$use_pkgconfig" = "x0"; then
-+ unique_cflags=
-+ if test "${includedir}" != "/usr/include"; then
-+ unique_cflags="${unique_cflags} -I${includedir}"
- fi
-- done
-- echo ${unique_cflags}
-+ for i in $cflags; do
-+ if test "${i}" != "-I${includedir}"; then
-+ unique_cflags="${unique_cflags} $i"
-+ fi
-+ done
-+ echo ${unique_cflags}
-+ else
-+ pkg-config --cflags "$pkgconfig_package"
-+ fi
- ;;
- --prefix)
- echo ${prefix}
---
-1.6.6.1
-
diff --git a/sane/patches/sane-1.0.21-udev.patch b/sane/patches/sane-1.0.21-udev.patch
deleted file mode 100644
index 176008c..0000000
--- a/sane/patches/sane-1.0.21-udev.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From ba900ddc747cb89c2600c60a1391862e918541d2 Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils(a)redhat.com>
-Date: Wed, 5 May 2010 11:49:10 +0200
-Subject: [PATCH] patch: udev
-
-Squashed commit of the following:
-
-commit eecfce287372abf2b336f0d6870611445170645b
-Author: Nils Philippsen <nils(a)redhat.com>
-Date: Wed May 5 11:14:59 2010 +0200
-
- adapt generated udev rules for Fedora
----
- tools/sane-desc.c | 14 +++++++-------
- 1 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/tools/sane-desc.c b/tools/sane-desc.c
-index 658555e..0b24e3b 100644
---- a/tools/sane-desc.c
-+++ b/tools/sane-desc.c
-@@ -56,9 +56,9 @@
- #define COLOR_NEW "\"#F00000\""
- #define COLOR_UNKNOWN "\"#000000\""
-
--#define DEVMODE "0664"
-+#define DEVMODE "0644"
- #define DEVOWNER "root"
--#define DEVGROUP "scanner"
-+#define DEVGROUP "root"
-
- #ifndef PATH_MAX
- # define PATH_MAX 1024
-@@ -3525,8 +3525,8 @@ print_udev (void)
- }
- }
- printf ("\n");
-- printf ("ATTRS{idVendor}==\"%s\", ATTRS{idProduct}==\"%s\", MODE=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n",
-- usbid->usb_vendor_id + 2, usbid->usb_product_id + 2, DEVMODE, DEVGROUP);
-+ printf ("ATTRS{idVendor}==\"%s\", ATTRS{idProduct}==\"%s\", ENV{libsane_matched}=\"yes\"\n",
-+ usbid->usb_vendor_id + 2, usbid->usb_product_id + 2);
- usbid = usbid->next;
- }
-
-@@ -3538,7 +3538,7 @@ print_udev (void)
- printf ("SUBSYSTEMS!=\"scsi\", GOTO=\"libsane_scsi_rules_end\"\n\n");
- printf ("LABEL=\"libsane_scsi_rules_begin\"\n");
- printf ("# Generic: SCSI device type 6 indicates a scanner\n");
-- printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"6\", MODE=\"%s\", GROUP=\"%s\"\n", DEVMODE, DEVGROUP);
-+ printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"6\", ENV{libsane_matched}=\"yes\"\n");
- printf ("# Some scanners advertise themselves as SCSI device type 3\n");
-
- while (scsiid)
-@@ -3571,8 +3571,8 @@ print_udev (void)
- }
- }
- printf ("\n");
-- printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", MODE=\"%s\", GROUP=\"%s\"\n",
-- scsiid->scsi_vendor_id, scsiid->scsi_product_id, DEVMODE, DEVGROUP);
-+ printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", ENV{libsane_matched}=\"yes\"\n",
-+ scsiid->scsi_vendor_id, scsiid->scsi_product_id);
- scsiid = scsiid->next;
- }
- printf ("LABEL=\"libsane_scsi_rules_end\"\n\n");
---
-1.6.6.1
-
diff --git a/sane/sane.nm b/sane/sane.nm
deleted file mode 100644
index 54b8d0a..0000000
--- a/sane/sane.nm
+++ /dev/null
@@ -1,60 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = sane
-version = 1.0.21
-release = 1
-
-groups = Application/Imaging
-url = ftp://ftp2.sane-project.org/pub/sane/
-license = GPLv2+
-summary = SANE - Scanner Access Now Easy.
-
-description
- sane-backends - includes: backends (scanner drivers),
- command-line-frontend (scanimage), network scanning daemon
- (saned) and SANE-API documentation.
-end
-
-source_dl = ftp://ftp2.sane-project.org/pub/sane/sane-backends-%{version}/
-sources = %{name}-backends-%{version}.tar.gz
-
-build
- requires
- libjpeg-devel
- libtiff-devel
- libusb-devel
- end
-
- DIR_APP = %{DIR_SRC}/%{name}-backends-%{version}
-
- configure_options += \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --enable-parport-directio
-
- install_cmds
- chmod 4755 %{BUILDROOT}/usr/bin/scanimage
- install -v -m 644 %{DIR_APP}/include/sane/* %{BUILDROOT}/usr/include/sane
- rm -vf %{BUILDROOT}/usr/share/doc/sane-1.0.20/README.solaris
- end
-end
-
-packages
- package %{name}
- end
-
- package %{name}-libs
- template LIBS
- end
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/sip/sip.nm b/sip/sip.nm
index f0249d7..9533fa5 100644
--- a/sip/sip.nm
+++ b/sip/sip.nm
@@ -5,7 +5,7 @@
name = sip
version = %{major_ver}.%{minor_ver}.%{rev_ver}
-release = 1
+release = 2
epoch = 1
major_ver = 4
@@ -37,7 +37,8 @@ build
build
python configure.py \
CFLAGS+="%{CFLAGS}" \
- CXXFLAGS+="%{CXXFLAGS}"
+ CXXFLAGS+="%{CXXFLAGS}" \
+ LFLAGS+="%{LDFLAGS}"
make %{PARALLELISMFLAGS}
end
@@ -45,7 +46,6 @@ end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
diff --git a/slang/slang.nm b/slang/slang.nm
index 8ec9eb4..7e46ea0 100644
--- a/slang/slang.nm
+++ b/slang/slang.nm
@@ -5,7 +5,7 @@
name = slang
version = 2.3.0
-release = 1
+release = 2
groups = System/Libraries
url = http://www.jedsoft.org/slang/
@@ -23,14 +23,16 @@ source_dl = http://www.jedsoft.org/releases/slang/
build
requires
+ libpng-devel
ncurses-devel
pcre-devel
+ zlib-devel
end
PARALLELISMFLAGS = # off
install_cmds
- rm -rvf %{BUILDROOT}/usr/share/slsh
+ rm -rvf %{BUILDROOT}%{bindir} %{BUILDROOT}%{datadir}/slsh
end
end
diff --git a/squashfs-tools/patches/squashfs-cflags.patch b/squashfs-tools/patches/squashfs-cflags.patch
deleted file mode 100644
index bb325d4..0000000
--- a/squashfs-tools/patches/squashfs-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- squashfs-tools/Makefile.orig 2010-02-13 14:00:54.000000000 -0600
-+++ squashfs-tools/Makefile 2010-02-13 14:02:58.000000000 -0600
-@@ -27,8 +27,8 @@
- UNSQUASHFS_OBJS = unsquashfs.o unsquash-1.o unsquash-2.o unsquash-3.o \
- unsquash-4.o swap.o compressor.o gzip_wrapper.o
-
--CFLAGS = $(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
-- -D_GNU_SOURCE -DCOMP_DEFAULT=\"$(COMP_DEFAULT)\" -O2 -Wall
-+CFLAGS = $(RPM_OPT_FLAGS) $(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
-+ -D_GNU_SOURCE -DCOMP_DEFAULT=\"$(COMP_DEFAULT)\"
-
- LIBS =
- ifdef LZMA_SUPPORT
diff --git a/squashfs-tools/patches/squashfs-xz.patch b/squashfs-tools/patches/squashfs-xz.patch
deleted file mode 100644
index 71fda95..0000000
--- a/squashfs-tools/patches/squashfs-xz.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- squashfs-tools/Makefile.orig 2010-02-13 14:05:21.000000000 -0600
-+++ squashfs-tools/Makefile 2010-02-13 14:05:29.000000000 -0600
-@@ -11,7 +11,7 @@
- # work) - download and unpack it, uncomment and set LZMA_DIR to unpacked source,
- # and uncomment the LZMA_SUPPORT line below.
-
--#XZ_SUPPORT = 1
-+XZ_SUPPORT = 1
- #LZMA_SUPPORT = 1
- #LZMA_DIR = ../../../LZMA/lzma465
-
diff --git a/squashfs-tools/squashfs-tools.nm b/squashfs-tools/squashfs-tools.nm
deleted file mode 100644
index f687d85..0000000
--- a/squashfs-tools/squashfs-tools.nm
+++ /dev/null
@@ -1,50 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = squashfs-tools
-version = 4.1
-release = 1
-
-groups = System/Filesystem
-url = http://squashfs.sf.net/
-license = GPLv2+
-summary = Utility for the creation of squashfs filesystems.
-
-description
- Squashfs is a highly compressed read-only filesystem for Linux.
-end
-
-source_dl = http://downloads.sourceforge.net/project/%{name}/%{name}/%{thisapp}
-sources = squashfs-%{version}.tar.gz
-
-build
- requires
- libattr-devel
- xz-devel
- zlib-devel
- end
-
- DIR_APP = %{DIR_SRC}/squashfs/squashfs-tools
-
- make_build_targets = RPM_OPT_FLAGS="%{CFLAGS}"
-
- install
- mkdir -pv %{BUILDROOT}/usr/bin
- install -m 755 mksquashfs %{BUILDROOT}/usr/bin
- install -m 755 unsquashfs %{BUILDROOT}/usr/bin
- end
-end
-
-# XXX This package has a very weird dependency to libgcc_s.so.1.
-# Can we fix this in a non-hacky way?
-packages
- package %{name}
- requires = libgcc_s.so.1
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/tcpick/tcpick.nm b/tcpick/tcpick.nm
deleted file mode 100644
index ce5f4fb..0000000
--- a/tcpick/tcpick.nm
+++ /dev/null
@@ -1,43 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = tcpick
-version = 0.2.1
-release = 1
-
-groups = Networking/Tools
-url = http://tcpick.sourceforge.net/
-license = GPLv2
-summary = A libpcap-based textmode sniffer for tcp streams.
-
-description
- Tcpick is able to save the captured flows in different files or
- displays them in the terminal, and so it is useful to sniff files that
- are transmitted via ftp or http. It can display all the stream on the
- terminal, when the connection is closed in different display modes like
- hexdump, hexdump + ascii, only printable charachters, raw mode and so
- on. Available a color mode too, helpful to read and understand better
- the output of the program. Actually it can handle several interfaces,
- including ethernet cards and ppp. It is useful to keep track of what
- users of a network are doing, and is usable with textmode tools like
- grep, sed, awk.
-end
-
-source_dl = http://sourceforge.net/projects/tcpick/files/%{name}/%{version}/
-
-build
- requires
- ncurses-devel
- libpcap-devel
- end
-end
-
-packages
- package %{name}
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/texinfo/texinfo.nm b/texinfo/texinfo.nm
index b441e94..b1b6d82 100644
--- a/texinfo/texinfo.nm
+++ b/texinfo/texinfo.nm
@@ -5,7 +5,7 @@
name = texinfo
version = 6.1
-release = 1
+release = 2
groups = Applications/Publishing
url = http://www.gnu.org/software/texinfo/
@@ -24,6 +24,7 @@ build
requires
help2man
ncurses-devel
+ perl(Data::Dumper)
perl-libintl-perl
zlib-devel
end
hooks/post-receive
--
IPFire 3.x development tree
reply other threads:[~2016-10-03 10:52 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161003105259.599A21078E81@git01.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox