* [IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 316bfb6ede68f5e94b884193706a321c95afc959
@ 2012-04-06 15:06 git
0 siblings, 0 replies; only message in thread
From: git @ 2012-04-06 15:06 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 44212 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 316bfb6ede68f5e94b884193706a321c95afc959 (commit)
via d5598ccef4b6c2e5ad1a7ff18f3d584f8ec7e230 (commit)
via cc619b74e4b2b7cf018e569cf6dc4c77c7e007f6 (commit)
via 279c76b64aaca36fed8175bab57fd5e9c5a03f0d (commit)
via b90f99810f421a234a5f162063d6135b0d2857c1 (commit)
via 29fd854cc4ee97c0e90343ccf3b656a20ac66d58 (commit)
via 86f1da55c6f48e98c6c6a8e38424646f9671909a (commit)
via 90ee35c362d077f66d8fa5e5eae4243c64b74b7d (commit)
via 583a815235b15c8c506934dac271f6542f2feb90 (commit)
via 5b04c464b65c1c29d83aa1f08083139cfe0507c0 (commit)
from e2c672b4c842e01784242b2afed28a73f7c170e9 (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 316bfb6ede68f5e94b884193706a321c95afc959
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 6 17:04:22 2012 +0200
cracklib: Fix setting password issue on x86_64 (#10074).
This was caused by a wrong path configuration.
Also moves libs to /usr and fixes a typo in the package description.
commit d5598ccef4b6c2e5ad1a7ff18f3d584f8ec7e230
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 6 17:02:52 2012 +0200
iproute2: Update to 3.3.0.
commit cc619b74e4b2b7cf018e569cf6dc4c77c7e007f6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 6 16:52:31 2012 +0200
linux-atm: Update to 2.5.1.
This update is required because of linking problems
on x86_64.
commit 279c76b64aaca36fed8175bab57fd5e9c5a03f0d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 6 14:28:33 2012 +0200
dracut: Update to 018.
commit b90f99810f421a234a5f162063d6135b0d2857c1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 6 14:12:17 2012 +0200
ipfire-release: Add pakfire repository information.
Also cleans up some of the code that creates the files
that are provided by this package. But no major changes.
commit 29fd854cc4ee97c0e90343ccf3b656a20ac66d58
Merge: 86f1da5 90ee35c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 6 14:09:28 2012 +0200
Merge remote-tracking branch 'stevee/authconfig'
commit 86f1da55c6f48e98c6c6a8e38424646f9671909a
Merge: 5b04c46 583a815
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 6 14:09:22 2012 +0200
Merge remote-tracking branch 'stevee/perl-FCGI'
commit 90ee35c362d077f66d8fa5e5eae4243c64b74b7d
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Apr 1 19:14:56 2012 +0200
authconfig: Update to 6.2.2.
commit 583a815235b15c8c506934dac271f6542f2feb90
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Thu Apr 5 20:42:35 2012 +0200
perl-FCGI: Requires perl(ExtUtils::ParseXS) to build.
commit 5b04c464b65c1c29d83aa1f08083139cfe0507c0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Apr 5 20:07:46 2012 +0200
glib2: Move libs to /usr.
-----------------------------------------------------------------------
Summary of changes:
authconfig/authconfig.nm | 13 +-
cracklib/cracklib.nm | 15 +-
dracut/dracut.nm | 7 +-
glib2/glib2.nm | 8 +-
ipfire-release/ipfire-release.nm | 50 ++++---
ipfire-release/repos/stable.repo | 6 +
ipfire-release/repos/testing.repo | 6 +
ipfire-release/repos/unstable.repo | 6 +
iproute2/iproute2.nm | 71 ++++++++-
.../iproute2-2.6.29-IPPROTO_IP_for_SA.patch | 11 ++
iproute2/patches/iproute2-2.6.29-kernel.patch | 11 ++
iproute2/patches/iproute2-2.6.31-tc_modules.patch | 12 ++
iproute2/patches/iproute2-2.6.35-print-route.patch | 13 ++
...e2-2.6.39-create-peer-veth-without-a-name.patch | 17 ++
.../iproute2-2.6.39-lnstat-dump-to-stdout.patch | 13 ++
iproute2/patches/iproute2-print-route-u32.patch | 20 +++
iproute2/patches/iproute2-sharepath.patch | 23 +++
iproute2/patches/iproute2-ss050901-opt_flags.patch | 12 ++
iproute2/patches/man-pages.patch | 84 ++++++++++
linux-atm/linux-atm.nm | 20 +--
linux-atm/patches/linux-arm-gcc43.patch | 11 ++
linux-atm/patches/linux-atm-2.4.1-gcc-4.patch | 161 --------------------
linux-atm/patches/linux-atm-2.4.1-nmu.patch | 98 ------------
.../patches/linux-atm-2.5.0-disable-ilmidiag.patch | 11 ++
linux-atm/patches/linux-atm-2.5.0-open-macro.patch | 11 ++
linux-atm/patches/man-pages.patch | 45 ++++++
perl-FCGI/perl-FCGI.nm | 3 +-
27 files changed, 440 insertions(+), 318 deletions(-)
create mode 100644 ipfire-release/repos/stable.repo
create mode 100644 ipfire-release/repos/testing.repo
create mode 100644 ipfire-release/repos/unstable.repo
create mode 100644 iproute2/patches/iproute2-2.6.29-IPPROTO_IP_for_SA.patch
create mode 100644 iproute2/patches/iproute2-2.6.29-kernel.patch
create mode 100644 iproute2/patches/iproute2-2.6.31-tc_modules.patch
create mode 100644 iproute2/patches/iproute2-2.6.35-print-route.patch
create mode 100644 iproute2/patches/iproute2-2.6.39-create-peer-veth-without-a-name.patch
create mode 100644 iproute2/patches/iproute2-2.6.39-lnstat-dump-to-stdout.patch
create mode 100644 iproute2/patches/iproute2-print-route-u32.patch
create mode 100644 iproute2/patches/iproute2-sharepath.patch
create mode 100644 iproute2/patches/iproute2-ss050901-opt_flags.patch
create mode 100644 iproute2/patches/man-pages.patch
create mode 100644 linux-atm/patches/linux-arm-gcc43.patch
delete mode 100644 linux-atm/patches/linux-atm-2.4.1-gcc-4.patch
delete mode 100644 linux-atm/patches/linux-atm-2.4.1-nmu.patch
create mode 100644 linux-atm/patches/linux-atm-2.5.0-disable-ilmidiag.patch
create mode 100644 linux-atm/patches/linux-atm-2.5.0-open-macro.patch
create mode 100644 linux-atm/patches/man-pages.patch
Difference in files:
diff --git a/authconfig/authconfig.nm b/authconfig/authconfig.nm
index 12b7230..2bb161a 100644
--- a/authconfig/authconfig.nm
+++ b/authconfig/authconfig.nm
@@ -4,8 +4,8 @@
###############################################################################
name = authconfig
-version = 6.1.14
-release = 2
+version = 6.2.2
+release = 1
groups = System/Base
url = https://fedorahosted.org/authconfig
@@ -13,9 +13,9 @@ license = GPLv2+
summary = Command line tool for setting up authentication from network services.
description
- Authconfig is a command line utility which can configure a workstation\
- to use shadow (more secure) passwords. Authconfig can also configure a \
- system to be a client for certain networked user information and \
+ Authconfig is a command line utility which can configure a workstation
+ to use shadow (more secure) passwords. Authconfig can also configure a
+ system to be a client for certain networked user information and
authentication schemes.
end
@@ -61,6 +61,9 @@ build
# Remove app icons for authconfig
rm -rf %{BUILDROOT}/usr/share/icons
+
+ # Remove unneded stuff for X11
+ rm -rf %{BUILDROOT}/etc/X11
end
end
diff --git a/cracklib/cracklib.nm b/cracklib/cracklib.nm
index dcb9003..93a3464 100644
--- a/cracklib/cracklib.nm
+++ b/cracklib/cracklib.nm
@@ -5,7 +5,7 @@
name = cracklib
version = 2.8.18
-release = 1
+release = 2
groups = Security/Password
url = http://sourceforge.net/projects/cracklib/
@@ -37,7 +37,7 @@ build
dictpath = %{dictdir}/pw_dict
configure_options += \
- --with-default-dict=/lib/cracklib/pw_dict \
+ --with-default-dict=%{dictpath} \
--with-python \
--disable-static
@@ -67,10 +67,6 @@ build
# Install python bindings
make install DESTDIR=%{BUILDROOT} INSTALL="install -c -p" -C python
- mkdir -pv %{BUILDROOT}/{,usr/}%{lib}
- mv -v %{BUILDROOT}%{libdir}/libcrack.so.2* %{BUILDROOT}/%{lib}
- ln -vsf ../../%{lib}/libcrack.so.2.8.1 %{BUILDROOT}%{libdir}/libcrack.so
-
mkdir -pv %{BUILDROOT}{%{dictdir},%{dictpath}}
util/cracklib-format cracklib-dicts/* | \
util/cracklib-packer %{BUILDROOT}%{dictpath}
@@ -121,10 +117,13 @@ packages
# We build an extra python package with the bindings for it.
package python-cracklib
- summary = Python bindings for ${thisapp}.
+ summary = Python bindings for %{thisapp}.
description = %{summary}
- files = /usr/lib*/python*
+ files
+ /usr/lib/python*
+ %{libdir}/python*
+ end
end
package %{name}-debuginfo
diff --git a/dracut/dracut.nm b/dracut/dracut.nm
index 8c0f9c7..b0a70fd 100644
--- a/dracut/dracut.nm
+++ b/dracut/dracut.nm
@@ -4,7 +4,7 @@
###############################################################################
name = dracut
-version = 017
+version = 018
release = 1
arch = noarch
@@ -26,6 +26,11 @@ build
docbook-xsl
end
+ prepare_cmds
+ # Disable dash syntax check as we don't have dash.
+ sed -e "s/dash/true/g" -i Makefile
+ end
+
dracutlibdir = %{prefix}/lib/dracut
install
diff --git a/glib2/glib2.nm b/glib2/glib2.nm
index 67c7fb0..62e04f0 100644
--- a/glib2/glib2.nm
+++ b/glib2/glib2.nm
@@ -6,7 +6,7 @@
name = glib2
ver_major = 2.31
version = %{ver_major}.2
-release = 1
+release = 2
thisapp = glib-%{version}
groups = System/Libraries
@@ -40,12 +40,6 @@ build
--with-pcre=system
install_cmds
- ./mkinstalldirs %{BUILDROOT}/lib
- cd %{BUILDROOT}/usr/lib && for name in glib gobject gmodule gthread gio; do \
- mv -v lib${name}-2.0.so.* ../../lib; \
- ln -svf ../../lib/lib${name}-2.0.so.*.* lib${name}-2.0.so; \
- done
-
mkdir -pv %{BUILDROOT}/etc/profile.d/
cp -vf %{DIR_SOURCE}/glib2-locale.sh %{BUILDROOT}/etc/profile.d/
end
diff --git a/ipfire-release/ipfire-release.nm b/ipfire-release/ipfire-release.nm
index afc0609..bd0e451 100644
--- a/ipfire-release/ipfire-release.nm
+++ b/ipfire-release/ipfire-release.nm
@@ -4,16 +4,17 @@
###############################################################################
# Make the configuration of your distribution right here.
-DISTRO_NAME = IPFire
-DISTRO_SNAME = ipfire
-DISTRO_VERSION = 3.0-alpha2
-DISTRO_RELEASE = 3
-DISTRO_SLOGAN = Gluttony
-DISTRO_COLOR = 0;31
+DISTRO_NAME = IPFire
+DISTRO_SNAME = ipfire
+DISTRO_RELEASE = 3
+DISTRO_VERSION = %{DISTRO_RELEASE}.0-alpha2
+DISTRO_CODENAME = Gluttony
+DISTRO_SLOGAN = An Open Source Firewall Solution
+DISTRO_COLOR = 0;31
name = %{DISTRO_SNAME}-release
version = %{DISTRO_VERSION}
-release = 1
+release = 2
epoch = 3
arch = noarch
@@ -38,12 +39,13 @@ build
install
mkdir -pv %{BUILDROOT}/etc
- echo "%{DISTRO_NAME} v%{DISTRO_VERSION} for %{DISTRO_ARCH} - %{DISTRO_SLOGAN} (\l)" \
- > %{BUILDROOT}/etc/issue
- echo "===============================" >> %{BUILDROOT}/etc/issue
- echo "\n running on \s \r \m" >> %{BUILDROOT}/etc/issue
+ cat <<EOF >%{BUILDROOT}/etc/issue
+ %{DISTRO_NAME} %{DISTRO_VERSION} (%{DISTRO_CODENAME}) - %{DISTRO_SLOGAN} (\l)
+ ===============================
+ \n running on \s \r
+ EOF
- echo "%{DISTRO_NAME} release %{DISTRO_VERSION} (%{DISTRO_SLOGAN})" \
+ echo "%{DISTRO_NAME} release %{DISTRO_VERSION} (%{DISTRO_CODENAME})" \
> %{BUILDROOT}/etc/%{DISTRO_SNAME}-release
ln -svf %{DISTRO_SNAME}-release %{BUILDROOT}/etc/system-release
@@ -51,18 +53,28 @@ build
echo "%{DISTRO_SNAME}.localdomain" > %{BUILDROOT}/etc/hostname
# Create /etc/os-release.
- echo "NAME=\"%{DISTRO_NAME}\"" >> %{BUILDROOT}/etc/os-release
- echo "VERSION=\"%{DISTRO_VERSION}\"" >> %{BUILDROOT}/etc/os-release
- echo "ID=%{DISTRO_SNAME}" >> %{BUILDROOT}/etc/os-release
- echo "VERSION_ID=%{DISTRO_RELEASE}" >> %{BUILDROOT}/etc/os-release
- echo "PRETTY_NAME=\"%{DISTRO_NAME} %{DISTRO_VERSION} (%{DISTRO_SLOGAN})\"" \
- >> %{BUILDROOT}/etc/os-release
- echo "ANSI_COLOR=%{DISTRO_COLOR}" >> %{BUILDROOT}/etc/os-release
+ cat <<EOF >%{BUILDROOT}/etc/os-release
+ NAME="%{DISTRO_NAME}"
+ VERSION="%{DISTRO_VERSION}"
+ ID=%{DISTRO_SNAME}
+ VERSION_ID=%{DISTRO_RELEASE}
+ PRETTY_NAME="%{DISTRO_NAME} %{DISTRO_VERSION} (%{DISTRO_CODENAME})"
+ ANSI_COLOR=%{DISTRO_COLOR}
+ EOF
+
+ # Install default repositories.
+ mkdir -pv %{BUILDROOT}%{sysconfdir}/pakfire/repos
+ cp -vf %{DIR_SOURCE}/repos/* %{BUILDROOT}%{sysconfdir}/pakfire/repos
end
end
packages
package %{name}
provides = system-release
+
+ configfiles
+ /etc/hostname
+ /etc/pakfire/repos
+ end
end
end
diff --git a/ipfire-release/repos/stable.repo b/ipfire-release/repos/stable.repo
new file mode 100644
index 0000000..2e34475
--- /dev/null
+++ b/ipfire-release/repos/stable.repo
@@ -0,0 +1,6 @@
+[repo:stable]
+description = IPFire 3 - Stable repository.
+enabled = 1
+baseurl = http://pakfire.ipfire.org/repositories/ipfire3/stable/%{arch}
+mirrors = https://pakfire.ipfire.org/distro/ipfire3/repo/stable/mirrorlist?arch=%{arch}
+priority = 500
diff --git a/ipfire-release/repos/testing.repo b/ipfire-release/repos/testing.repo
new file mode 100644
index 0000000..63b3674
--- /dev/null
+++ b/ipfire-release/repos/testing.repo
@@ -0,0 +1,6 @@
+[repo:testing]
+description = IPFire 3 - This is a repository for testing stuff.
+enabled = 0
+baseurl = http://pakfire.ipfire.org/repositories/ipfire3/testing/%{arch}
+mirrors = https://pakfire.ipfire.org/distro/ipfire3/repo/testing/mirrorlist?arch=%{arch}
+priority = 100
diff --git a/ipfire-release/repos/unstable.repo b/ipfire-release/repos/unstable.repo
new file mode 100644
index 0000000..76ea412
--- /dev/null
+++ b/ipfire-release/repos/unstable.repo
@@ -0,0 +1,6 @@
+[repo:unstable]
+description = IPFire 3 - Public unstable repository.
+enabled = 0
+baseurl = http://pakfire.ipfire.org/repositories/ipfire3/unstable/%{arch}
+mirrors = https://pakfire.ipfire.org/distro/ipfire3/repo/unstable/mirrorlist?arch=%{arch}
+priority = 200
diff --git a/iproute2/iproute2.nm b/iproute2/iproute2.nm
index bf13e4a..9d85951 100644
--- a/iproute2/iproute2.nm
+++ b/iproute2/iproute2.nm
@@ -4,8 +4,8 @@
###############################################################################
name = iproute2
-version = 2.6.39
-release = 2
+version = 3.3.0
+release = 1
groups = Networking/Tools
url = http://www.linuxfoundation.org/en/Net:Iproute2
@@ -19,29 +19,86 @@ description
end
source_dl =
+sources = %{thisapp}.tar.xz
build
requires
bison
db4-devel
flex
+ libnl-devel
+ linux-atm-devel >= 2.5.1
+ iptables-devel
end
prepare_cmds
- sed -i -e "s(a)DESTDIR=.*@DESTDIR=@" \
- -e "s@/share/@/usr/share/@g" Makefile
+ sed -e "s/_VERSION_/%{version}/" man/man8/ss.8
end
+ export RPM_OPT_FLAGS = %{CFLAGS}
+ export LIBDIR = %{libdir}
+ export IPT_LIB_DIR = %{libdir}/xtables
+
install
- make install DESTDIR=%{BUILDROOT}
- mkdir -pv %{BUILDROOT}/usr/sbin
- mv -v %{BUILDROOT}/sbin/arpd %{BUILDROOT}/usr/sbin
+ # The installation routine that comes with that package
+ # is totally unusable for use, so do it manually.
+
+ mkdir -pv \
+ %{BUILDROOT}%{includedir} \
+ %{BUILDROOT}%{sbindir} \
+ %{BUILDROOT}%{mandir}/man{3,8} \
+ %{BUILDROOT}%{datadir}/tc \
+ %{BUILDROOT}%{libdir}/tc \
+ %{BUILDROOT}%{sysconfdir}/iproute2
+
+ # Install binaries.
+ for bin in genl/genl ip/{ifcfg,ip,routef,routel,rtpr} tc/tc \
+ misc/{arpd,ifstat,lnstat,nstat,rtacct,ss}; do
+ install -v -m 755 ${bin} %{BUILDROOT}%{sbindir}
+ done
+ ln -svf lnstat %{BUILDROOT}%{sbindir}/ctstat
+ ln -svf lnstat %{BUILDROOT}%{sbindir}/rtstat
+
+ # Install libs.
+ for lib in tc/q_atm.so tc/m_xt.so; do
+ install -v -m 755 ${lib} %{BUILDROOT}%{libdir}/tc
+ done
+ ln -svf m_xt.so %{BUILDROOT}%{libdir}/tc/m_ipt.so
+
+ # libnetlink
+ install -v -m 644 include/libnetlink.h %{BUILDROOT}%{includedir}
+ install -v -m 644 lib/libnetlink.a %{BUILDROOT}%{libdir}
+
+ # Install documentation.
+ install -v -m 644 man/man3/*.3 %{BUILDROOT}%{mandir}/man3
+ install -v -m 644 man/man8/*.8 %{BUILDROOT}%{mandir}/man8
+ ln -svf lnstat.8 %{BUILDROOT}%{mandir}/man8/ctstat.8
+ ln -svf lnstat.8 %{BUILDROOT}%{mandir}/man8/rtstat.8
+ ln -svf routel.8 %{BUILDROOT}%{mandir}/man8/routef.8
+
+ for sh in netem/normal.dist netem/pareto.dist netem/paretonormal.dist; do
+ install -v -m 644 ${sh} %{BUILDROOT}%{datadir}/tc
+ done
+
+ # Install configuration.
+ install -v -m 644 etc/iproute2/* %{BUILDROOT}%{sysconfdir}/iproute2
+ end
+
+ # Keep libnetlink.a.
+ keep_libraries
+ %{libdir}/libnetlink.a
end
end
packages
package %{name}
groups += Base
+
+ configfiles = %{sysconfdir}/iproute2
+ end
+
+ package %{name}-devel
+ template DEVEL
end
package %{name}-debuginfo
diff --git a/iproute2/patches/iproute2-2.6.29-IPPROTO_IP_for_SA.patch b/iproute2/patches/iproute2-2.6.29-IPPROTO_IP_for_SA.patch
new file mode 100644
index 0000000..48ffcb4
--- /dev/null
+++ b/iproute2/patches/iproute2-2.6.29-IPPROTO_IP_for_SA.patch
@@ -0,0 +1,11 @@
+diff -up iproute2-2.6.29/ip/ipxfrm.c.old iproute2-2.6.29/ip/ipxfrm.c
+--- iproute2-2.6.29/ip/ipxfrm.c.old 2009-03-24 23:15:14.000000000 +0100
++++ iproute2-2.6.29/ip/ipxfrm.c 2009-04-24 09:35:58.203735119 +0200
+@@ -1156,6 +1156,7 @@ static int xfrm_selector_upspec_parse(st
+ case IPPROTO_UDP:
+ case IPPROTO_SCTP:
+ case IPPROTO_DCCP:
++ case IPPROTO_IP: /* to allow shared SA for different protocols */
+ break;
+ default:
+ fprintf(stderr, "\"sport\" and \"dport\" are invalid with proto=%s\n", strxf_proto(sel->proto));
diff --git a/iproute2/patches/iproute2-2.6.29-kernel.patch b/iproute2/patches/iproute2-2.6.29-kernel.patch
new file mode 100644
index 0000000..df9125a
--- /dev/null
+++ b/iproute2/patches/iproute2-2.6.29-kernel.patch
@@ -0,0 +1,11 @@
+diff -up iproute2-20091009/Makefile.kernel iproute2-20091009/Makefile
+--- iproute2-20091009/Makefile.kernel 2009-09-21 10:26:11.000000000 +0200
++++ iproute2-20091009/Makefile 2009-10-09 12:27:03.687382422 +0200
+@@ -6,6 +6,7 @@ CONFDIR=/etc/iproute2
+ DOCDIR=/share/doc/iproute2
+ MANDIR=/share/man
+ ARPDDIR=/var/lib/arpd
++KERNEL_INCLUDE=/usr/include
+
+ # Path to db_185.h include
+ DBM_INCLUDE:=$(ROOTDIR)/usr/include
diff --git a/iproute2/patches/iproute2-2.6.31-tc_modules.patch b/iproute2/patches/iproute2-2.6.31-tc_modules.patch
new file mode 100644
index 0000000..0daa17b
--- /dev/null
+++ b/iproute2/patches/iproute2-2.6.31-tc_modules.patch
@@ -0,0 +1,12 @@
+diff -up iproute2-2.6.31/Makefile.old iproute2-2.6.31/Makefile
+--- iproute2-2.6.31/Makefile.old 2010-01-04 12:46:47.000000000 +0100
++++ iproute2-2.6.31/Makefile 2010-01-04 12:50:17.396384644 +0100
+@@ -13,7 +13,7 @@ DBM_INCLUDE:=$(ROOTDIR)/usr/include
+
+ SHARED_LIBS = y
+
+-DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\"
++DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" -DIPT_LIB_DIR=\"$(IPT_LIB_DIR)\"
+ ifneq ($(SHARED_LIBS),y)
+ DEFINES+= -DNO_SHARED_LIBS
+ endif
diff --git a/iproute2/patches/iproute2-2.6.35-print-route.patch b/iproute2/patches/iproute2-2.6.35-print-route.patch
new file mode 100644
index 0000000..04f3cf7
--- /dev/null
+++ b/iproute2/patches/iproute2-2.6.35-print-route.patch
@@ -0,0 +1,13 @@
+diff --git a/ip/iproute.c b/ip/iproute.c
+index 711576e..86c7ab7 100644
+--- a/ip/iproute.c
++++ b/ip/iproute.c
+@@ -160,7 +160,7 @@ int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
+ if (r->rtm_family == AF_INET6 && table != RT_TABLE_MAIN)
+ ip6_multiple_tables = 1;
+
+- if (filter.cloned == !(r->rtm_flags&RTM_F_CLONED))
++ if (filter.cloned && !(r->rtm_flags&RTM_F_CLONED))
+ return 0;
+
+ if (r->rtm_family == AF_INET6 && !ip6_multiple_tables) {
diff --git a/iproute2/patches/iproute2-2.6.39-create-peer-veth-without-a-name.patch b/iproute2/patches/iproute2-2.6.39-create-peer-veth-without-a-name.patch
new file mode 100644
index 0000000..b77dd71
--- /dev/null
+++ b/iproute2/patches/iproute2-2.6.39-create-peer-veth-without-a-name.patch
@@ -0,0 +1,17 @@
+diff --git a/ip/.link_veth.c.swp b/ip/.link_veth.c.swp
+deleted file mode 100644
+index e3b5480..0000000
+Binary files a/ip/.link_veth.c.swp and /dev/null differ
+diff --git a/ip/link_veth.c b/ip/link_veth.c
+index 3d19b01..eb0f41e 100644
+--- a/ip/link_veth.c
++++ b/ip/link_veth.c
+@@ -27,7 +27,7 @@ static void usage(void)
+ static int veth_parse_opt(struct link_util *lu, int argc, char **argv,
+ struct nlmsghdr *hdr)
+ {
+- char *name, *type, *link, *dev;
++ char *name = NULL, *type = NULL, *link = NULL, *dev = NULL;
+ int err, len;
+ struct rtattr * data;
+ int group;
diff --git a/iproute2/patches/iproute2-2.6.39-lnstat-dump-to-stdout.patch b/iproute2/patches/iproute2-2.6.39-lnstat-dump-to-stdout.patch
new file mode 100644
index 0000000..a5b7b62
--- /dev/null
+++ b/iproute2/patches/iproute2-2.6.39-lnstat-dump-to-stdout.patch
@@ -0,0 +1,13 @@
+diff --git a/misc/lnstat.c b/misc/lnstat.c
+index 32ab6a4..431bfc7 100644
+--- a/misc/lnstat.c
++++ b/misc/lnstat.c
+@@ -322,7 +322,7 @@ int main(int argc, char **argv)
+ int i;
+ struct table_hdr *header;
+ case MODE_DUMP:
+- lnstat_dump(stderr, lnstat_files);
++ lnstat_dump(stdout, lnstat_files);
+ break;
+ case MODE_NORMAL:
+
diff --git a/iproute2/patches/iproute2-print-route-u32.patch b/iproute2/patches/iproute2-print-route-u32.patch
new file mode 100644
index 0000000..48920d8
--- /dev/null
+++ b/iproute2/patches/iproute2-print-route-u32.patch
@@ -0,0 +1,20 @@
+--- iproute2-2.6.35/ip/iproute.c 2010-08-31 13:01:39.151185561 +0200
++++ iproute2-print-route-u32.c 2010-08-31 13:41:04.072928779 +0200
+@@ -368,7 +368,7 @@
+ abuf, sizeof(abuf)));
+ }
+ if (tb[RTA_PRIORITY])
+- fprintf(fp, " metric %d ", *(__u32*)RTA_DATA(tb[RTA_PRIORITY]));
++ fprintf(fp, " metric %u ", *(__u32*)RTA_DATA(tb[RTA_PRIORITY]));
+ if (r->rtm_flags & RTNH_F_DEAD)
+ fprintf(fp, "dead ");
+ if (r->rtm_flags & RTNH_F_ONLINK)
+@@ -487,7 +487,7 @@
+ if (i < sizeof(mx_names)/sizeof(char*) && mx_names[i])
+ fprintf(fp, " %s", mx_names[i]);
+ else
+- fprintf(fp, " metric %d", i);
++ fprintf(fp, " metric %u", i);
+ if (mxlock & (1<<i))
+ fprintf(fp, " lock");
+
diff --git a/iproute2/patches/iproute2-sharepath.patch b/iproute2/patches/iproute2-sharepath.patch
new file mode 100644
index 0000000..f314922
--- /dev/null
+++ b/iproute2/patches/iproute2-sharepath.patch
@@ -0,0 +1,23 @@
+diff -up iproute-2.6.29/iproute2-2.6.29/tc/tc_util.c.movelib iproute-2.6.29/iproute2-2.6.29/tc/tc_util.c
+--- iproute2-2.6.29/tc/tc_util.c.movelib 2009-01-15 21:25:04.000000000 +0100
++++ iproute2-2.6.29/tc/tc_util.c 2009-02-04 08:58:36.000000000 +0100
+@@ -24,8 +24,8 @@
+ #include "utils.h"
+ #include "tc_util.h"
+
+-#ifndef LIBDIR
+-#define LIBDIR "/usr/lib/"
++#ifndef SHAREDIR
++#define SHAREDIR "/usr/share/"
+ #endif
+
+ const char *get_tc_lib(void)
+@@ -34,7 +34,7 @@ const char *get_tc_lib(void)
+
+ lib_dir = getenv("TC_LIB_DIR");
+ if (!lib_dir)
+- lib_dir = LIBDIR "/tc/";
++ lib_dir = SHAREDIR "/tc/";
+
+ return lib_dir;
+ }
diff --git a/iproute2/patches/iproute2-ss050901-opt_flags.patch b/iproute2/patches/iproute2-ss050901-opt_flags.patch
new file mode 100644
index 0000000..686bf68
--- /dev/null
+++ b/iproute2/patches/iproute2-ss050901-opt_flags.patch
@@ -0,0 +1,12 @@
+diff -up iproute2-2.6.29/iproute2-2.6.29/Makefile.opt iproute2-2.6.29/iproute2-2.6.29/Makefile
+--- iproute2-2.6.29/Makefile.opt 2008-08-12 14:19:58.000000000 +0200
++++ iproute2-2.6.29/Makefile 2008-08-12 14:21:42.000000000 +0200
+@@ -22,7 +22,7 @@ ADDLIB+=ipx_ntop.o ipx_pton.o
+
+ CC = gcc
+ HOSTCC = gcc
+-CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall
++CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall $(RPM_OPT_FLAGS)
+ CFLAGS = $(CCOPTS) -I../include $(DEFINES)
+ YACCFLAGS = -d -t -v
+
diff --git a/iproute2/patches/man-pages.patch b/iproute2/patches/man-pages.patch
new file mode 100644
index 0000000..1592889
--- /dev/null
+++ b/iproute2/patches/man-pages.patch
@@ -0,0 +1,84 @@
+diff -up iproute2-2.6.29/man/man8/cbq.8.man iproute2-2.6.29/man/man8/cbq.8
+--- iproute2-2.6.29/man/man8/cbq.8.man 2009-09-24 14:05:44.868922557 +0200
++++ iproute2-2.6.29/man/man8/cbq.8 2009-09-24 14:05:24.760143753 +0200
+@@ -0,0 +1 @@
++.so man8/tc-cbq.8
+\ No newline at end of file
+diff -up /dev/null iproute2-2.6.29/man/man8/ifcfg.8
+--- /dev/null 2009-09-22 09:26:40.270218984 +0200
++++ iproute2-2.6.29/man/man8/ifcfg.8 2009-09-24 14:03:05.415151874 +0200
+@@ -0,0 +1,57 @@
++.TH IFCFG 8 "September 24 2009" "iproute2" "Linux"
++.SH NAME
++ifcfg \- simplistic script which replaces ifconfig IP managment
++.SH SYNOPSIS
++.ad l
++.in +8
++.ti -8
++.B ifcfg
++.RI "[ " DEVICE " [ " :ALIAS: " ] ] [ " command " ] " ADDRESS " [ " LENGTH " ] [ " PEER " ] "
++.sp
++
++.SH DESCRIPTION
++This manual page documents briefly the
++.B ifcfg
++command.
++.PP
++This is a simplistic script replacing one option of
++.B ifconfig
++, namely, IP address management. It not only adds
++addresses, but also carries out Duplicate Address Detection RFC-DHCP,
++sends unsolicited ARP to update the caches of other hosts sharing
++the interface, adds some control routes and restarts Router Discovery
++when it is necessary.
++
++I strongly recommend using it
++.RI instead
++of
++.RI ifconfig
++both on hosts and on routers.
++
++.SH IFCONFIG - COMMAND SYNTAX
++
++.SS
++.TP
++.B DEVICE
++- it may have alias, suffix, separated by colon.
++
++.TP
++.B command
++- add, delete or stop.
++
++.TP
++.B address
++- optionally followed by prefix length.
++
++.TP
++.B peer
++- optional peer address for pointpoint interfaces.
++
++.SH EXAMPLE
++.nf ifcfg eth0 193.233.7.90/24
++.fi
++This function determines, whether this is router or host.
++It returns 0, if the host is apparently not router.
++
++.SH SEE ALSO
++.BR ip-cref.dvi
+diff -up /dev/null iproute2-2.6.29/man/man8/nstat.8
+--- /dev/null 2009-09-22 09:26:40.270218984 +0200
++++ iproute2-2.6.29/man/man8/nstat.8 2009-09-24 14:03:05.416161849 +0200
+@@ -0,0 +1 @@
++.so man8/rtacct.8
+\ No newline at end of file
+--- iproute2-2.6.35/man/man8/ss.8 2010-08-04 19:45:59.000000000 +0200
++++ iproute2-2.6.35/man/man8/ss.8.new 2010-10-11 14:47:06.084216018 +0200
+@@ -114,7 +114,7 @@
+ List all the tcp sockets in state FIN-WAIT-1 for our apache to network 193.233.7/24 and look at their timers.
+ .SH SEE ALSO
+ .BR ip (8),
+-.BR /usr/share/doc/iproute-doc/ss.html " (package iproutedoc)"
++.BR /usr/share/doc/iproute-doc-_VERSION_/ss.ps " (package iproute-doc)"
+ .SH AUTHOR
+ .I ss
+ was written by Alexey Kuznetosv, <kuznet(a)ms2.inr.ac.ru>.
diff --git a/linux-atm/linux-atm.nm b/linux-atm/linux-atm.nm
index 428e21f..81ff42f 100644
--- a/linux-atm/linux-atm.nm
+++ b/linux-atm/linux-atm.nm
@@ -4,7 +4,7 @@
###############################################################################
name = linux-atm
-version = 2.4.1
+version = 2.5.1
release = 1
groups = System/Daemons
@@ -17,36 +17,34 @@ description
using theLinux ATM API.
end
-source_dl =
+sources = %{thisapp}.tgz
+source_dl = http://downloads.sf.net/%{name}/
build
requires
+ bison
flex
flex-devel
kernel-headers
perl
end
- configure_options += \
- --sysconfdir=/etc \
- --mandir=/usr/share/man
-
prepare_cmds
sed -e "s/-lfl/&_pic/g" -i src/*{,/*}/Makefile.in
end
-
- # Fails
- #def test
- # make check
- #end
end
packages
package %{name}
+
+ package %{name}-libs
+ template LIBS
end
package %{name}-devel
template DEVEL
+
+ requires += %{name}-libs = %{thisver}
end
package %{name}-debuginfo
diff --git a/linux-atm/patches/linux-arm-gcc43.patch b/linux-atm/patches/linux-arm-gcc43.patch
new file mode 100644
index 0000000..9d9c5cd
--- /dev/null
+++ b/linux-atm/patches/linux-arm-gcc43.patch
@@ -0,0 +1,11 @@
+diff -rNu linux-atm-2.5.0/src/led/main.c linux-atm-2.5.0-atomix/src/led/main.c
+--- linux-atm-2.5.0/src/led/main.c 2005-10-06 19:27:50.000000000 +0200
++++ linux-atm-2.5.0-atomix/src/led/main.c 2008-04-18 12:14:21.000000000 +0200
+@@ -36,6 +36,7 @@
+ #include <sys/time.h>
+ #include <unistd.h>
+ #include <signal.h>
++#include <limits.h>
+ #include <ctype.h>
+ #include <string.h>
+ #include <getopt.h>
diff --git a/linux-atm/patches/linux-atm-2.4.1-gcc-4.patch b/linux-atm/patches/linux-atm-2.4.1-gcc-4.patch
deleted file mode 100644
index f6be9d2..0000000
--- a/linux-atm/patches/linux-atm-2.4.1-gcc-4.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-diff -Naur linux-atm-2.4.1-orig/src/ilmid/atmf_uni.c linux-atm-2.4.1/src/ilmid/atmf_uni.c
---- linux-atm-2.4.1-orig/src/ilmid/atmf_uni.c 2001-09-03 19:41:06.000000000 +0100
-+++ linux-atm-2.4.1/src/ilmid/atmf_uni.c 2005-08-13 10:22:44.000000000 +0100
-@@ -187,7 +187,7 @@
- newPrefix->name = alloc_t(AsnOid);
- newPrefix->name->octs = alloc(varBindName->octetLen);
- AsnOidCopy(newPrefix->name, varBindName);
-- Q_INSERT_BEFORE((NetPrefixNode *) var->value, newPrefix, prefix);
-+ Q_INSERT_BEFORE((*((NetPrefixNode **)&var->value)), newPrefix, prefix);
- if(atmNetPrefix.octs == NULL)
- {
- atmNetPrefix.octetLen = varBindName->octetLen - NETPREFIX_LEN - 2;
-@@ -197,7 +197,7 @@
- }
- else if (varbind->value->a.simple->a.number == INVALID && cmp == AsnOidEqual)
- {
-- Q_REMOVE((NetPrefixNode *) var->value, prefix);
-+ Q_REMOVE((*((NetPrefixNode **) &var->value)), prefix);
- }
-
- return NOERROR;
-diff -Naur linux-atm-2.4.1-orig/src/lib/sapequal.c linux-atm-2.4.1/src/lib/sapequal.c
---- linux-atm-2.4.1-orig/src/lib/sapequal.c 2001-09-03 19:41:05.000000000 +0100
-+++ linux-atm-2.4.1/src/lib/sapequal.c 2005-02-06 19:24:37.000000000 +0000
-@@ -65,6 +65,7 @@
- CHECK(l2.itu.window,a.l2.itu.window > b.l2.itu.window);
- break;
- default:
-+ ;
- }
- switch (a.l3_proto) {
- case ATM_L3_X25:
-@@ -83,6 +84,7 @@
- if (a.l3.user != b.l3.user) return 0;
- break;
- default:
-+ ;
- }
- return 1;
- }
-diff -Naur linux-atm-2.4.1-orig/src/maint/atmtcp.c linux-atm-2.4.1/src/maint/atmtcp.c
---- linux-atm-2.4.1-orig/src/maint/atmtcp.c 2001-09-03 19:41:06.000000000 +0100
-+++ linux-atm-2.4.1/src/maint/atmtcp.c 2005-08-13 10:22:44.000000000 +0100
-@@ -60,7 +60,7 @@
- static IN *inputs = NULL;
- static fd_set in_set;
- static int fds = 0;
--static int debug = 0;
-+int debug = 0;
- static int links = 0;
-
-
-diff -Naur linux-atm-2.4.1-orig/src/maint/enitune.c linux-atm-2.4.1/src/maint/enitune.c
---- linux-atm-2.4.1-orig/src/maint/enitune.c 2001-09-03 19:41:06.000000000 +0100
-+++ linux-atm-2.4.1/src/maint/enitune.c 2005-02-06 19:24:37.000000000 +0000
-@@ -44,6 +44,7 @@
- if (*end || mult.rx <= 100) usage(name);
- break;
- default:
-+ ;
- }
- if (argc != optind+1) usage(name);
- sioc.number = strtol(argv[optind],&end,0);
-diff -Naur linux-atm-2.4.1-orig/src/mpoad/p_factory.c linux-atm-2.4.1/src/mpoad/p_factory.c
---- linux-atm-2.4.1-orig/src/mpoad/p_factory.c 2001-09-03 19:41:06.000000000 +0100
-+++ linux-atm-2.4.1/src/mpoad/p_factory.c 2005-08-13 10:22:44.000000000 +0100
-@@ -31,16 +31,17 @@
- * beginning at location "addr".
- */
- uint32_t sum = 0;
-+ uint16_t *addr16 = addr;
-
- while( count > 1 ) {
- /* This is the inner loop */
-- sum += * ((uint16_t *) addr)++;
-+ sum += * addr16++;
- count -= 2;
- }
-
- /* Add left-over byte, if any */
- if( count > 0 )
-- sum += * (unsigned char *) addr;
-+ sum += * (unsigned char *) addr16;
-
- /* Fold 32-bit sum to 16 bits */
- while (sum>>16)
-diff -Naur linux-atm-2.4.1-orig/src/qgen/qlib.c linux-atm-2.4.1/src/qgen/qlib.c
---- linux-atm-2.4.1-orig/src/qgen/qlib.c 2001-09-03 19:41:05.000000000 +0100
-+++ linux-atm-2.4.1/src/qgen/qlib.c 2005-08-13 10:22:44.000000000 +0100
-@@ -26,8 +26,6 @@
- #include "op.h"
-
-
--static int debug = 0;
--
-
- void PREFIX(report)(int severity,const char *msg,...)
- {
-@@ -830,6 +828,8 @@
-
- #ifdef STANDALONE
-
-+int debug = 0;
-+
- int main(int argc,const char **argv)
- {
- unsigned char msg[5000]; /* should be large enough for that */
-diff -Naur linux-atm-2.4.1-orig/src/qgen/qlib.h linux-atm-2.4.1/src/qgen/qlib.h
---- linux-atm-2.4.1-orig/src/qgen/qlib.h 2001-09-03 19:41:05.000000000 +0100
-+++ linux-atm-2.4.1/src/qgen/qlib.h 2005-08-13 10:22:44.000000000 +0100
-@@ -23,7 +23,6 @@
- #define Q_FATAL -1
-
-
--extern int q_dump;
- extern void q_report(int severity,const char *msg,...);
-
- #ifdef DUMP_MODE
-diff -Naur linux-atm-2.4.1-orig/src/sigd/proto.c linux-atm-2.4.1/src/sigd/proto.c
---- linux-atm-2.4.1-orig/src/sigd/proto.c 2001-09-03 19:41:06.000000000 +0100
-+++ linux-atm-2.4.1/src/sigd/proto.c 2005-02-06 19:24:37.000000000 +0000
-@@ -259,6 +259,7 @@
- break;
- }
- default:
-+ ;
- }
- va_end(ap);
- if ((size = q_close(&dsc)) >= 0) to_signaling(sock->sig,q_buffer,size);
-@@ -288,6 +289,7 @@
- }
- break;
- default:
-+ ;
- }
- va_end(ap);
- }
-diff -Naur linux-atm-2.4.1-orig/src/switch/debug/debug.c linux-atm-2.4.1/src/switch/debug/debug.c
---- linux-atm-2.4.1-orig/src/switch/debug/debug.c 2001-09-03 19:41:06.000000000 +0100
-+++ linux-atm-2.4.1/src/switch/debug/debug.c 2005-08-13 10:22:44.000000000 +0100
-@@ -18,7 +18,7 @@
- #define COMPONENT "FAB(debug)"
-
-
--#define PRV(call) ((FAB *) (call)->fab)
-+#define PRV(call) (*((FAB **) &(call)->fab))
-
-
- typedef struct _fab {
-diff -Naur linux-atm-2.4.1-orig/src/switch/tcp/tcpsw.c linux-atm-2.4.1/src/switch/tcp/tcpsw.c
---- linux-atm-2.4.1-orig/src/switch/tcp/tcpsw.c 2001-09-03 19:41:06.000000000 +0100
-+++ linux-atm-2.4.1/src/switch/tcp/tcpsw.c 2005-08-13 10:22:44.000000000 +0100
-@@ -27,7 +27,7 @@
-
- #define COMPONENT "FAB(tcp)"
-
--#define PRV(call) ((FAB *) (call)->fab)
-+#define PRV(call) (*((FAB **) &(call)->fab))
-
- #define MAX_VCI 1024
-
diff --git a/linux-atm/patches/linux-atm-2.4.1-nmu.patch b/linux-atm/patches/linux-atm-2.4.1-nmu.patch
deleted file mode 100644
index ebf0a68..0000000
--- a/linux-atm/patches/linux-atm-2.4.1-nmu.patch
+++ /dev/null
@@ -1,98 +0,0 @@
---- linux-atm-2.4.1~/src/arpd/arp.c 2001-09-03 20:41:05.000000000 +0200
-+++ linux-atm-2.4.1/src/arpd/arp.c 2007-07-19 01:38:37.000000000 +0200
-@@ -16,6 +16,7 @@
- #include <sys/socket.h> /* for linux/if_arp.h */
- #include <netinet/in.h> /* for ntohs, etc. */
- #define _LINUX_NETDEVICE_H /* very crude hack for glibc2 */
-+#include <linux/types.h>
- #include <linux/if_arp.h>
- #include <linux/if_ether.h>
- #include <atm.h>
-diff -urNad linux-atm-2.4.1~/src/arpd/io.c linux-atm-2.4.1/src/arpd/io.c
---- linux-atm-2.4.1~/src/arpd/io.c 2001-09-03 20:41:05.000000000 +0200
-+++ linux-atm-2.4.1/src/arpd/io.c 2007-07-19 01:38:37.000000000 +0200
-@@ -19,6 +19,7 @@
- #include <net/if.h>
- #include <netinet/in.h>
- #include <atm.h>
-+#include <linux/types.h>
- #include <linux/atmclip.h> /* for CLIP_DEFAULT_IDLETIMER */
- #include <linux/atmarp.h>
- #define _LINUX_NETDEVICE_H /* glibc2 */
-diff -urNad linux-atm-2.4.1~/src/arpd/itf.c linux-atm-2.4.1/src/arpd/itf.c
---- linux-atm-2.4.1~/src/arpd/itf.c 2001-09-03 20:41:05.000000000 +0200
-+++ linux-atm-2.4.1/src/arpd/itf.c 2007-07-19 01:38:37.000000000 +0200
-@@ -10,6 +10,7 @@
- #include <stdint.h>
- #include <string.h>
- #include <sys/types.h>
-+#include <linux/types.h>
- #include <linux/atmclip.h>
- #include <sys/socket.h>
- #define _LINUX_NETDEVICE_H /* glibc2 */
-diff -urNad linux-atm-2.4.1~/src/mpoad/io.c linux-atm-2.4.1/src/mpoad/io.c
---- linux-atm-2.4.1~/src/mpoad/io.c 2001-09-03 20:41:06.000000000 +0200
-+++ linux-atm-2.4.1/src/mpoad/io.c 2007-07-19 01:38:37.000000000 +0200
-@@ -19,6 +19,7 @@
- _syscall3(int,poll,struct pollfd *,ufds,unsigned int,nfds,int,timeout);
- #endif
- #include <atm.h>
-+#include <linux/types.h>
- #include <linux/atmioc.h>
- #include <linux/atmmpc.h>
- #include <sys/types.h>
-diff -urNad linux-atm-2.4.1~/src/mpoad/k_interf.c linux-atm-2.4.1/src/mpoad/k_interf.c
---- linux-atm-2.4.1~/src/mpoad/k_interf.c 2001-09-03 20:41:06.000000000 +0200
-+++ linux-atm-2.4.1/src/mpoad/k_interf.c 2007-07-19 01:38:37.000000000 +0200
-@@ -9,6 +9,7 @@
- #include <sys/param.h> /* for OPEN_MAX */
- #include <stdint.h>
- #include <netinet/in.h> /* for ntohl() */
-+#include <linux/types.h>
- #include <linux/atmmpc.h>
- #include <atm.h>
- #include "k_interf.h"
-diff -urNad linux-atm-2.4.1~/src/mpoad/lecs.c linux-atm-2.4.1/src/mpoad/lecs.c
---- linux-atm-2.4.1~/src/mpoad/lecs.c 2001-09-03 20:41:06.000000000 +0200
-+++ linux-atm-2.4.1/src/mpoad/lecs.c 2007-07-19 01:39:04.000000000 +0200
-@@ -11,6 +11,7 @@
- #include <errno.h>
- #include <atm.h>
- #include <atmsap.h>
-+#include <linux/types.h>
- #include <linux/atmmpc.h> /* for MPOA Device type TLV */
- #include "lecs.h"
- #include "k_interf.h"
-diff -urNad linux-atm-2.4.1~/src/mpoad/main.c linux-atm-2.4.1/src/mpoad/main.c
---- linux-atm-2.4.1~/src/mpoad/main.c 2001-09-03 20:41:06.000000000 +0200
-+++ linux-atm-2.4.1/src/mpoad/main.c 2007-07-19 01:38:37.000000000 +0200
-@@ -9,6 +9,7 @@
- #include <time.h>
- #include <sys/ioctl.h>
- #include <atm.h>
-+#include <linux/types.h>
- #include <linux/atmdev.h>
- #include <linux/atmmpc.h>
- #include <sys/socket.h>
-diff -urNad linux-atm-2.4.1~/src/mpoad/p_factory.c linux-atm-2.4.1/src/mpoad/p_factory.c
---- linux-atm-2.4.1~/src/mpoad/p_factory.c 2007-07-19 01:22:42.000000000 +0200
-+++ linux-atm-2.4.1/src/mpoad/p_factory.c 2007-07-19 01:38:37.000000000 +0200
-@@ -5,6 +5,7 @@
- #include <sys/types.h>
- #include <stdint.h>
- #include <netinet/in.h>
-+#include <linux/types.h>
- #include <linux/atmmpc.h>
- #include <sys/socket.h>
- #include <unistd.h>
-diff -urNad linux-atm-2.4.1~/src/mpoad/p_recogn.c linux-atm-2.4.1/src/mpoad/p_recogn.c
---- linux-atm-2.4.1~/src/mpoad/p_recogn.c 2001-09-03 20:41:06.000000000 +0200
-+++ linux-atm-2.4.1/src/mpoad/p_recogn.c 2007-07-19 01:39:12.000000000 +0200
-@@ -7,6 +7,7 @@
- #include <stdlib.h>
- #include <sys/time.h>
- #include <atm.h>
-+#include <linux/types.h>
- #include <linux/atmmpc.h>
- #include <netinet/in.h>
- #include <limits.h> /* For UINT_MAX */
diff --git a/linux-atm/patches/linux-atm-2.5.0-disable-ilmidiag.patch b/linux-atm/patches/linux-atm-2.5.0-disable-ilmidiag.patch
new file mode 100644
index 0000000..c420be9
--- /dev/null
+++ b/linux-atm/patches/linux-atm-2.5.0-disable-ilmidiag.patch
@@ -0,0 +1,11 @@
+--- linux-atm/src/ilmid/Makefile.am~ 2007-07-11 17:07:57.000000000 +0100
++++ linux-atm/src/ilmid/Makefile.am 2007-08-23 09:22:45.000000000 +0100
+@@ -2,7 +2,7 @@ SUBDIRS = asn1
+
+ INCLUDES = -I$(srcdir)/../ilmid/asn1
+
+-sbin_PROGRAMS = ilmid ilmidiag
++sbin_PROGRAMS = ilmid
+
+ ilmid_SOURCES = rfc1157_snmp.c rfc1157_snmp.h rfc1155_smi.c rfc1155_smi.h \
+ util.c util.h io.c io.h message.c message.h \
diff --git a/linux-atm/patches/linux-atm-2.5.0-open-macro.patch b/linux-atm/patches/linux-atm-2.5.0-open-macro.patch
new file mode 100644
index 0000000..928222f
--- /dev/null
+++ b/linux-atm/patches/linux-atm-2.5.0-open-macro.patch
@@ -0,0 +1,11 @@
+--- linux-atm/src/maint/atmtcp.c~ 2007-08-22 14:59:21.000000000 +0100
++++ linux-atm/src/maint/atmtcp.c 2007-08-22 18:27:24.000000000 +0100
+@@ -109,7 +109,7 @@ static void control(int in_link,struct a
+ switch (msg->type) {
+ case ATMTCP_CTRL_OPEN:
+ if (out->ops->open)
+- changed += out->ops->open(out,in_link,msg);
++ changed += (out->ops->open)(out,in_link,msg);
+ break;
+ case ATMTCP_CTRL_CLOSE:
+ if (out->ops->close)
diff --git a/linux-atm/patches/man-pages.patch b/linux-atm/patches/man-pages.patch
new file mode 100644
index 0000000..c504cfe
--- /dev/null
+++ b/linux-atm/patches/man-pages.patch
@@ -0,0 +1,45 @@
+diff -up linux-atm-2.5.1/src/led/zeppelin.8.fixman linux-atm-2.5.1/src/led/zeppelin.8
+--- linux-atm-2.5.1/src/led/zeppelin.8.fixman 2003-05-02 19:35:04.000000000 +0200
++++ linux-atm-2.5.1/src/led/zeppelin.8 2010-10-13 12:58:18.000000000 +0200
+@@ -99,7 +99,7 @@ Ring and ATM parts of the ELAN, so using
+ recommended. Token Ring support has received less testing than its
+ Ethernet counterpart.
+ .SH FILES
+-.IP \fI/var/run/lec[interface number].pid\fP
++\fI/var/run/lec[interface number].pid\fP
+ The file containing the process id of zeppelin.
+ .SH BUGS
+ John Bonham died 1980 and Led Zeppelin broke.
+diff -up linux-atm-2.5.1/src/mpoad/mpcd.8.fixman linux-atm-2.5.1/src/mpoad/mpcd.8
+--- linux-atm-2.5.1/src/mpoad/mpcd.8.fixman 2001-10-10 00:33:07.000000000 +0200
++++ linux-atm-2.5.1/src/mpoad/mpcd.8 2010-10-13 12:59:14.000000000 +0200
+@@ -28,7 +28,7 @@ mpcd \- ATM MPOA (Multi\-Protocol Over A
+ .B ]]
+ .SH DESCRIPTION
+ MPOA client
+-.SM(MPC) is responsible for creating and receiving
++.SM (MPC) is responsible for creating and receiving
+ internetwork layer shortcuts. Using these shortcuts MPCs forward
+ unicast internetwork layer packets effectively over ATM without need
+ for routing protocols.
+@@ -43,7 +43,7 @@ accepts shortcuts and packets arriving o
+ shortcuts is done with the help of
+ .SM MPOA
+ server
+-.SM(MPS).
++.SM (MPS).
+ .PP
+ Just as the Linux
+ .SM LAN
+diff -up linux-atm-2.5.1/src/sigd/atmsigd.conf.4.fixman linux-atm-2.5.1/src/sigd/atmsigd.conf.4
+--- linux-atm-2.5.1/src/sigd/atmsigd.conf.4.fixman 2001-10-10 00:33:07.000000000 +0200
++++ linux-atm-2.5.1/src/sigd/atmsigd.conf.4 2010-10-13 12:58:49.000000000 +0200
+@@ -125,7 +125,7 @@ a comment. The `#' character cannot be e
+ .P
+ If an option is specified in \fBatmsigd.conf\fP and on the command
+ line, the command line has priority.
+-.COMPATIBILITY
++.SH COMPATIBILITY
+ Certain options used by past versions of \fBatmsigd\fP but no longer documented
+ on the man page are still recognized and supported, but they also yield a
+ warning message. Future versions of \fBatmsigd\fP will not recognize those
diff --git a/perl-FCGI/perl-FCGI.nm b/perl-FCGI/perl-FCGI.nm
index 439449c..b5bce3f 100644
--- a/perl-FCGI/perl-FCGI.nm
+++ b/perl-FCGI/perl-FCGI.nm
@@ -5,7 +5,7 @@
name = perl-FCGI
version = 0.74
-release = 1
+release = 2
thisapp = FCGI-%{version}
groups = Development/Libraries
@@ -22,6 +22,7 @@ source_dl = http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/
build
requires
perl(ExtUtils::MakeMaker)
+ perl(ExtUtils::ParseXS)
end
build
hooks/post-receive
--
IPFire 3.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-04-06 15:06 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-04-06 15:06 [IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 316bfb6ede68f5e94b884193706a321c95afc959 git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox