[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 18860e84283cb71f5ba79842495de0cd93acde23
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 18860e84283cb71f5ba79842495de0cd93acde23 (commit) via 4872f95d4e4d7239d46721541a54f83514454bb6 (commit) via df5e0ab74c7e664e672108da75983765342e1327 (commit) via 63153e2e9dc54962f25b3f0c3be8d7170651db57 (commit) via ee007926dda91c3ae939bddbff5d4891a274edad (commit) via c8a19fb4502045811be3f620e197e4e82b7e43ec (commit) via 1178d37f411057c323eb56688581d1e173d3a90b (commit) via a5b6959d06856c30adc5715fe57e5143cfbdcabd (commit) via f2f0e6d7aef7802148a603fe11c885f94a157df4 (commit) via bf2a8b13d5cc0a0e54734cf28c9f2149e827427f (commit) via 9cc8d938e9803dc09e188ccd177dfe7f1090558a (commit) via 3a312b6846fec3469673b7a52e29843f26e4b2fa (commit) via 012e0c3820527a692233f7acf17d333d052b9df4 (commit) via 5bb8e86ecf5f4d6d1171ba86d48324eaeb1e03a2 (commit) via 45ae749d698514032ebcd56e7dacbaf61ddcff17 (commit) via 3f3af8843f022f98c9c83c88052efdff16f215a2 (commit) via 795dc62cf9c93e45dd24bc640a570dd149886c50 (commit) via cb7dca5933296ee4cdd24d36b956d51f72b101f5 (commit) via 832fe3cd87334ba01badfac3aab7094fa2fef39e (commit) via b1b61deeb8239753a4dc644b95c6ffced86e28e5 (commit) via c767415bdbef5de07f7d01f3f25b0b96644bfb32 (commit) via 23f3b23a4a5b0751bcb1072997726dc028051ba2 (commit) via a10a16b06d0a6a10746b65290659191ca740684d (commit) via 4bfc4e7cd49dd5de5823cd17adb8ca3358b8beab (commit) via 31f3f78e48a0a3775fdce92ea4753687cb4a867a (commit) via db6ad87ff29fb315b14f424818169a6371d3a476 (commit) via 583d4fb65ad0855f71171aa2da3fe90463b8a6cd (commit) via bbdb881e01d52bd43873b5209e5b7f65675c3eff (commit) via 6cec16f10500c636daba338da40b8bd7832d27ed (commit) via 56a3a748d1a3d76f39360bf001128e144b04d04d (commit) via 513f4535068e01d775180d0fa627eeb9fcdb9a95 (commit) via d3c627560ba9ef2c8201c70a551046c634e963ee (commit) via 8987574967da11d724a361910fb98c3711c1434c (commit) via adb30435e8d11b62634a162bc861e7eca5bc70df (commit) via 124c2dc3823545bc708e356a4ab6def49ad23d3d (commit) via 8d190e916d56386502fb06f0b4a6ae06d5a045fb (commit) via 2db15b5895f884cdce5b18980f4a452535a92748 (commit) via 2fe91a2fb67928cb120a7c09859123be4c92ab33 (commit) via 556d42e897b213676500eba5dc24edd8dfc19c77 (commit) via e08cf03c0988045be1556f61879209ac4fef59da (commit) via bb4ba5983e9588cccead6383b1198014ac88f0ae (commit) via 0e4842b8377520befb04ede721947a9ff03efeb3 (commit) via 7c05d6332883094621ca28c05a2a49848ea37888 (commit) via 08dba51714c5df2deda89a1add284e1c26add75f (commit) via 4f90b599cce07340c10b1be18674114ba64b0db7 (commit) via cd711c7bcd64a9564c1defa06996e9fb8ce996ef (commit) via d0d49567153195b16378555bf5aab3efa0fc2754 (commit) via a9b8f2e475df1a9dba7c1b5077b303c81a637ab4 (commit) via eafee5ca3aca3391c3da2543fa8329fee1bc5d41 (commit) via 2032d212035db04f3ebb03ec211c199826cb9724 (commit) from 42945a976f7ef2cbb0718015fb5dc360a024d61b (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 18860e84283cb71f5ba79842495de0cd93acde23 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:44:26 2011 +0100
mstpd: Update to SVN revision 22.
commit 4872f95d4e4d7239d46721541a54f83514454bb6 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:44:11 2011 +0100
xen: Fix download URL.
commit df5e0ab74c7e664e672108da75983765342e1327 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:44:00 2011 +0100
iasl: Add debuginfo package.
commit 63153e2e9dc54962f25b3f0c3be8d7170651db57 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:43:50 2011 +0100
dev86: Add debuginfo package.
commit ee007926dda91c3ae939bddbff5d4891a274edad Author: Ben Schweikert trikolon@ipfire.org Date: Sun Dec 11 19:38:44 2011 +0100
xen: Enabled HVM support and disabled external downloads.
commit c8a19fb4502045811be3f620e197e4e82b7e43ec Merge: 1178d37 2032d21 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:25:17 2011 +0100
Merge remote-tracking branch 'stevee/xen-iasl'
commit 1178d37f411057c323eb56688581d1e173d3a90b Merge: a5b6959 a9b8f2e Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:25:11 2011 +0100
Merge remote-tracking branch 'stevee/xen-dev86'
commit a5b6959d06856c30adc5715fe57e5143cfbdcabd Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:23:18 2011 +0100
vim: -debuginfo package should not be in Base group.
commit f2f0e6d7aef7802148a603fe11c885f94a157df4 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:22:46 2011 +0100
sudo: -debuginfo package should not be in Base group.
commit bf2a8b13d5cc0a0e54734cf28c9f2149e827427f Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:22:11 2011 +0100
shadow-utils: -debuginfo package should not be in Base group.
commit 9cc8d938e9803dc09e188ccd177dfe7f1090558a Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:21:30 2011 +0100
rsyslog: Should not be in Base group.
commit 3a312b6846fec3469673b7a52e29843f26e4b2fa Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:20:34 2011 +0100
psmisc: -debuginfo package should not be in Base group.
commit 012e0c3820527a692233f7acf17d333d052b9df4 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:20:03 2011 +0100
procps: -debuginfo package should not be in Base group.
commit 5bb8e86ecf5f4d6d1171ba86d48324eaeb1e03a2 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:18:32 2011 +0100
pciutils: -debuginfo package should not be in Base group.
commit 45ae749d698514032ebcd56e7dacbaf61ddcff17 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:17:50 2011 +0100
passwd: -debuginfo package should not be in Base group.
commit 3f3af8843f022f98c9c83c88052efdff16f215a2 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:17:03 2011 +0100
net-tools: -debuginfo package should not be in Base group.
commit 795dc62cf9c93e45dd24bc640a570dd149886c50 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:16:07 2011 +0100
memtest86+: -debuginfo package should not be in Base group.
commit cb7dca5933296ee4cdd24d36b956d51f72b101f5 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:15:12 2011 +0100
man-db: -debuginfo package should not be in Base group.
commit 832fe3cd87334ba01badfac3aab7094fa2fef39e Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:14:30 2011 +0100
lsof: Should not be in Base group.
commit b1b61deeb8239753a4dc644b95c6ffced86e28e5 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:14:01 2011 +0100
logrotate: -debuginfo package should not be in Base group.
commit c767415bdbef5de07f7d01f3f25b0b96644bfb32 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:13:12 2011 +0100
less: -debuginfo package should not be in Base group.
commit 23f3b23a4a5b0751bcb1072997726dc028051ba2 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:12:37 2011 +0100
jwhois: Should not be in Base group.
commit a10a16b06d0a6a10746b65290659191ca740684d Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:11:47 2011 +0100
iputils: -debuginfo package should not be in Base group.
commit 4bfc4e7cd49dd5de5823cd17adb8ca3358b8beab Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:10:57 2011 +0100
iproute2: -debuginfo package should not be in Base group.
commit 31f3f78e48a0a3775fdce92ea4753687cb4a867a Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:10:22 2011 +0100
initscripts: -debuginfo package should not be in Base group.
commit db6ad87ff29fb315b14f424818169a6371d3a476 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:09:18 2011 +0100
iftop: Should not be in Base group.
commit 583d4fb65ad0855f71171aa2da3fe90463b8a6cd Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:08:21 2011 +0100
htop: -debuginfo package should not be in Base group.
commit bbdb881e01d52bd43873b5209e5b7f65675c3eff Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:07:07 2011 +0100
hdparm: -debuginfo package should not be in Base group.
commit 6cec16f10500c636daba338da40b8bd7832d27ed Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:06:29 2011 +0100
grub: Should not be in Base group.
commit 56a3a748d1a3d76f39360bf001128e144b04d04d Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:05:46 2011 +0100
ethtool: -debuginfo package should not be in Base group.
commit 513f4535068e01d775180d0fa627eeb9fcdb9a95 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:04:58 2011 +0100
acpid: -debuginfo package should not be in Base group.
commit d3c627560ba9ef2c8201c70a551046c634e963ee Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:03:34 2011 +0100
which: -debuginfo package should not be in Base or Build group.
commit 8987574967da11d724a361910fb98c3711c1434c Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:03:20 2011 +0100
tar: -debuginfo package should not be in Base or Build group.
commit adb30435e8d11b62634a162bc861e7eca5bc70df Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:02:27 2011 +0100
system-release: Package did obsolete itself?!
commit 124c2dc3823545bc708e356a4ab6def49ad23d3d Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:02:05 2011 +0100
sed: -debuginfo package should not be in Base or Build group.
commit 8d190e916d56386502fb06f0b4a6ae06d5a045fb Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:01:55 2011 +0100
pkg-config: -debuginfo package should not be in Base or Build group.
commit 2db15b5895f884cdce5b18980f4a452535a92748 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:01:46 2011 +0100
patch: -debuginfo package should not be in Base or Build group.
commit 2fe91a2fb67928cb120a7c09859123be4c92ab33 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:01:25 2011 +0100
make: -debuginfo package should not be in Build group.
commit 556d42e897b213676500eba5dc24edd8dfc19c77 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:01:14 2011 +0100
libtool: -debuginfo package should not be in Base or Build group.
commit e08cf03c0988045be1556f61879209ac4fef59da Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:01:03 2011 +0100
gzip: -debuginfo package should not be in Base or Build group.
commit bb4ba5983e9588cccead6383b1198014ac88f0ae Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 10:00:44 2011 +0100
gawk: -debuginfo package should not be in Base or Build group.
commit 0e4842b8377520befb04ede721947a9ff03efeb3 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 09:59:52 2011 +0100
grep: -debuginfo package should not be in Base or Build group.
commit 7c05d6332883094621ca28c05a2a49848ea37888 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 09:57:32 2011 +0100
findutils: -debuginfo package should not be in Base or Build group.
commit 08dba51714c5df2deda89a1add284e1c26add75f Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 09:52:37 2011 +0100
setup: This is a noarch package.
And does not have a debuginfo package.
commit 4f90b599cce07340c10b1be18674114ba64b0db7 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 09:43:24 2011 +0100
diffutils: -debuginfo package should not be in Base or Build group.
commit cd711c7bcd64a9564c1defa06996e9fb8ce996ef Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 09:35:54 2011 +0100
bash: -debuginfo package should not be in group Base or Build.
commit d0d49567153195b16378555bf5aab3efa0fc2754 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Dec 15 09:33:46 2011 +0100
coreutils: Don't make -debuginfo a pkg of group Build.
commit a9b8f2e475df1a9dba7c1b5077b303c81a637ab4 Author: Ben Schweikert ben.schweikert@ipfire.org Date: Sun Dec 11 22:11:50 2011 +0100
dev86: New package.
Also needed for Xen's HVM support.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit eafee5ca3aca3391c3da2543fa8329fee1bc5d41 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Dec 11 21:59:17 2011 +0100
SDL: Rename package.
commit 2032d212035db04f3ebb03ec211c199826cb9724 Author: Ben Schweikert ben.schweikert@ipfire.org Date: Sun Dec 11 21:14:02 2011 +0100
iasl: New package.
Needed by xen (for HVM mode).
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
-----------------------------------------------------------------------
Summary of changes: sdl/sdl.nm => SDL/SDL.nm | 0 acpid/acpid.nm | 5 +- bash/bash.nm | 6 ++- coreutils/coreutils.nm | 6 ++- dev86/dev86.nm | 64 ++++++++++++++++++++++++ dev86/patches/01-dev86-pic.patch | 20 ++++++++ dev86/patches/02-dev86-0.16.17-fortify.patch | 43 ++++++++++++++++ diffutils/diffutils.nm | 6 ++- ethtool/ethtool.nm | 5 +- findutils/findutils.nm | 5 +- gawk/gawk.nm | 5 +- grep/grep.nm | 5 +- grub/grub.nm | 4 +- gzip/gzip.nm | 5 +- hdparm/hdparm.nm | 5 +- htop/htop.nm | 5 +- iasl/iasl.nm | 60 +++++++++++++++++++++++ iasl/patches/Werror.patch | 10 ++++ iasl/patches/iasl-20110922-as-needed.patch | 16 ++++++ iasl/patches/iasl-20110922-locale.patch | 16 ++++++ iftop/iftop.nm | 5 +- initscripts/initscripts.nm | 6 ++- iproute2/iproute2.nm | 5 +- iputils/iputils.nm | 5 +- jwhois/jwhois.nm | 5 +- less/less.nm | 5 +- libtool/libtool.nm | 6 ++- logrotate/logrotate.nm | 5 +- lsof/lsof.nm | 5 +- make/make.nm | 6 ++- man-db/man-db.nm | 6 ++- memtest86+/memtest86+.nm | 4 +- mstpd/mstpd.nm | 4 +- net-tools/net-tools.nm | 6 ++- passwd/passwd.nm | 6 ++- patch/patch.nm | 6 ++- pciutils/pciutils.nm | 4 +- pkg-config/pkg-config.nm | 6 ++- procps/procps.nm | 6 ++- psmisc/psmisc.nm | 6 ++- rsyslog/rsyslog.nm | 4 +- sed/sed.nm | 5 +- setup/setup.nm | 7 +-- shadow-utils/shadow-utils.nm | 6 ++- sudo/sudo.nm | 5 +- system-release/system-release.nm | 1 - tar/tar.nm | 5 +- vim/vim.nm | 5 +- which/which.nm | 6 ++- xen/patches/00-xen-detect.patch | 67 -------------------------- xen/patches/02-patch.patch0 | 23 +++++++++ xen/patches/xen-ipxe.patch0 | 23 +++++++++ xen/xen.nm | 26 +++++----- 53 files changed, 415 insertions(+), 166 deletions(-) rename sdl/sdl.nm => SDL/SDL.nm (100%) create mode 100644 dev86/dev86.nm create mode 100644 dev86/patches/01-dev86-pic.patch create mode 100644 dev86/patches/02-dev86-0.16.17-fortify.patch create mode 100644 iasl/iasl.nm create mode 100644 iasl/patches/Werror.patch create mode 100644 iasl/patches/iasl-20110922-as-needed.patch create mode 100644 iasl/patches/iasl-20110922-locale.patch delete mode 100644 xen/patches/00-xen-detect.patch create mode 100644 xen/patches/02-patch.patch0 create mode 100644 xen/patches/xen-ipxe.patch0
Difference in files: diff --git a/SDL/SDL.nm b/SDL/SDL.nm new file mode 100644 index 0000000..5e22e05 --- /dev/null +++ b/SDL/SDL.nm @@ -0,0 +1,42 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = SDL +version = 1.2.14 +release = 1 + +groups = System/Libraries +url = http://www.libsdl.org/ +license = LGPLv2+ +summary = A cross-platform multimedia library. + +description + Simple DirectMedia Layer (SDL) is a cross-platform multimedia library + designed to provide fast access to the graphics frame buffer and audio + device. +end + +source_dl = http://www.libsdl.org/release/ + +build + requires + directfb-devel + libusb-compat-devel + pkg-config + end +end + +packages + package %{name} + end + + package %{name}-devel + template DEVEL + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/acpid/acpid.nm b/acpid/acpid.nm index 4e41f98..b0baa16 100644 --- a/acpid/acpid.nm +++ b/acpid/acpid.nm @@ -5,9 +5,9 @@
name = acpid version = 2.0.9 -release = 4 +release = 5
-groups = Base System/Daemons +groups = System/Daemons url = http://tedfelix.com/linux/acpid-netlink.html license = GPLv2+ summary = ACPI Event Daemon. @@ -36,6 +36,7 @@ end
packages package %{name} + groups += Base end
package %{name}-debuginfo diff --git a/bash/bash.nm b/bash/bash.nm index 0aa49f0..e6c0ff5 100644 --- a/bash/bash.nm +++ b/bash/bash.nm @@ -5,9 +5,9 @@
name = bash version = 4.2 -release = 4 +release = 5
-groups = Base Build System/Tools +groups = System/Tools url = http://www.gnu.org/software/bash/ license = GPLv2+ summary = Bash is short for born again shell. @@ -67,6 +67,8 @@ end
packages package %{name} + groups += Base Build + prerequires = coreutils requires = /etc/bashrc /etc/profile
diff --git a/coreutils/coreutils.nm b/coreutils/coreutils.nm index 8061fd9..55ddee9 100644 --- a/coreutils/coreutils.nm +++ b/coreutils/coreutils.nm @@ -5,9 +5,9 @@
name = coreutils version = 8.14 -release = 1 +release = 2
-groups = Base Build System/Base +groups = System/Base url = http://www.gnu.org/software/coreutils/ license = GPLv3+ summary = A set of basic GNU tools commonly used in shell scripts. @@ -80,6 +80,8 @@ end
packages package %{name} + groups += Base Build + end
package %{name}-debuginfo template DEBUGINFO diff --git a/dev86/dev86.nm b/dev86/dev86.nm new file mode 100644 index 0000000..a067999 --- /dev/null +++ b/dev86/dev86.nm @@ -0,0 +1,64 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = dev86 +version = 0.16.18 +release = 2 + +maintainer = Ben Schweikert ben.schweikert@ipfire.org +groups = Development/Languages +url = http://www.debath.co.uk/dev86/ +license = GPL+ +summary = Cross development C compiler. + +description + This is a cross development C compiler, assembler and linker + environment for the production of 8086 executables + (Optionally MSDOS COM) +end + +source_dl = http://www.debath.co.uk/dev86/ +sources = Dev86src-%{version}.tar.gz + +build + requires + ncurses-devel + end + + build + make bcc86 unproto copt as86 ld86 CFLAGS="%{CFLAGS}" + make -C cpp CFLAGS="%{CFLAGS}" %{PARALLELISMFLAGS} + make -C ar CFLAGS="%{CFLAGS}" %{PARALLELISMFLAGS} + make -C ld CFLAGS="%{CFLAGS}" %{PARALLELISMFLAGS} + + # ncc doesn't support gcc optflags and no parallel build + make + end + + make_install_targets = \ + DIST=%{BUILDROOT} \ + MANDIR=/usr/share/man \ + LIBDIR=/usr/lib/bcc \ + INCLDIR=/usr/include/bcc \ + LOCLAPREFIX=/usr \ + install install-man + + install_cmds + # Remove useless files. + rm -rf %{BUILDROOT}/usr/share/{applications,pixmaps} + end +end + +packages + package %{name} + + package %{name}-devel + template DEVEL + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/dev86/patches/01-dev86-pic.patch b/dev86/patches/01-dev86-pic.patch new file mode 100644 index 0000000..ec5d706 --- /dev/null +++ b/dev86/patches/01-dev86-pic.patch @@ -0,0 +1,20 @@ +--- dev86-0.16.18/elksemu/elks.c.orig 2005-11-04 01:35:37.000000000 +0100 ++++ dev86-0.16.18/elksemu/elks.c 2005-11-04 01:45:28.000000000 +0100 +@@ -129,8 +129,17 @@ + static inline int vm86_mine(struct vm86_struct* v86) + { + int __res; ++#ifndef __PIC__ + __asm__ __volatile__("int $0x80\n" + :"=a" (__res):"a" ((int)OLD_SYS_vm86), "b" ((int)v86)); ++#else ++ __asm__ __volatile__( ++ "movl %%ebx,%%ecx\n\t" ++ "movl %2,%%ebx\n\t" ++ "int $0x80\n\t" ++ "movl %%ecx,%%ebx\n\t" ++ :"=a" (__res):"a" ((int)OLD_SYS_vm86), "r" ((int)v86) : "ecx"); ++#endif + return __res; + } + #endif diff --git a/dev86/patches/02-dev86-0.16.17-fortify.patch b/dev86/patches/02-dev86-0.16.17-fortify.patch new file mode 100644 index 0000000..715d0c4 --- /dev/null +++ b/dev86/patches/02-dev86-0.16.17-fortify.patch @@ -0,0 +1,43 @@ +--- dev86-0.16.17/bcc/bcc.c ++++ dev86-0.16.17/bcc/bcc.c +@@ -19,6 +19,7 @@ + #ifdef __STDC__ + #include <stdlib.h> + #ifndef MSDOS ++#include <limits.h> + #include <unistd.h> + #endif + #else +@@ -596,12 +597,17 @@ + } + } + +-void +-command_reset() +-{ + #ifndef MAXPATHLEN ++#ifdef PATH_MAX ++#define MAXPATHLEN PATH_MAX ++#else + #define MAXPATHLEN 1024 + #endif ++#endif ++ ++void ++command_reset() ++{ + char buf[MAXPATHLEN]; + char ** prefix; + char * saved_cmd; +@@ -1308,11 +1314,7 @@ + + for(d=s=ptr; d && *s; s=d) + { +-#ifdef MAXPATHLEN + char buf[MAXPATHLEN]; +-#else +- char buf[1024]; +-#endif + + free(temp); + d=strchr(s, ':'); diff --git a/diffutils/diffutils.nm b/diffutils/diffutils.nm index f7b41ec..9d676c3 100644 --- a/diffutils/diffutils.nm +++ b/diffutils/diffutils.nm @@ -5,9 +5,9 @@
name = diffutils version = 3.2 -release = 1 +release = 2
-groups = Base Build Development/Tools +groups = Development/Tools url = http://www.gnu.org/software/diffutils/diffutils.html license = GPLv2+ summary = A GNU collection of diff utilities. @@ -32,6 +32,8 @@ end
packages package %{name} + groups += Base Build + end
package %{name}-debuginfo template DEBUGINFO diff --git a/ethtool/ethtool.nm b/ethtool/ethtool.nm index ce61a72..1f7d906 100644 --- a/ethtool/ethtool.nm +++ b/ethtool/ethtool.nm @@ -5,9 +5,9 @@
name = ethtool version = 2.6.34 -release = 1 +release = 2
-groups = Base Applications/System +groups = Applications/System url = http://sourceforge.net/projects/gkernel/ license = GPLv2 summary = Ethernet settings tool for PCI ethernet cards. @@ -27,6 +27,7 @@ end
packages package %{name} + groups += Base end
package %{name}-debuginfo diff --git a/findutils/findutils.nm b/findutils/findutils.nm index 8e840ca..652d138 100644 --- a/findutils/findutils.nm +++ b/findutils/findutils.nm @@ -5,9 +5,9 @@
name = findutils version = 4.5.10 -release = 1 +release = 2
-groups = Base Build System/Tools +groups = System/Tools url = http://www.gnu.org/software/findutils/ license = GPLv3+ summary = The GNU versions of find utilities (find and xargs). @@ -46,6 +46,7 @@ end
packages package %{name} + groups += Base Build end
package %{name}-debuginfo diff --git a/gawk/gawk.nm b/gawk/gawk.nm index d64c620..30bffdd 100644 --- a/gawk/gawk.nm +++ b/gawk/gawk.nm @@ -5,9 +5,9 @@
name = gawk version = 4.0.0 -release = 1 +release = 2
-groups = Base Build System/Tools +groups = System/Tools url = http://www.gnu.org/software/gawk/gawk.html license = GPLv3+ summary = The GNU version of the awk text processing utility. @@ -50,6 +50,7 @@ end
packages package %{name} + groups += Base Build end
package %{name}-debuginfo diff --git a/grep/grep.nm b/grep/grep.nm index 348d8a4..f50b4cb 100644 --- a/grep/grep.nm +++ b/grep/grep.nm @@ -5,9 +5,9 @@
name = grep version = 2.10 -release = 1 +release = 2
-groups = Base Build Applications/Text +groups = Applications/Text url = http://www.gnu.org/software/grep/ license = GPLv3+ summary = A pattern matching utilities. @@ -36,6 +36,7 @@ end
packages package %{name} + groups += Base Build end
package %{name}-debuginfo diff --git a/grub/grub.nm b/grub/grub.nm index 6b9ab69..cea1a68 100644 --- a/grub/grub.nm +++ b/grub/grub.nm @@ -5,10 +5,10 @@
name = grub version = 1.99 -release = 2 +release = 3 sup_arches = i686
-groups = Base System/Boot +groups = System/Boot url = http://www.gnu.org/software/grub/ license = GPLv2+ summary = Grand Unified Boot Loader. diff --git a/gzip/gzip.nm b/gzip/gzip.nm index ca3970b..624226a 100644 --- a/gzip/gzip.nm +++ b/gzip/gzip.nm @@ -5,9 +5,9 @@
name = gzip version = 1.4 -release = 1 +release = 2
-groups = Base Build Applications/Compression +groups = Applications/Compression url = http://www.gzip.org/ license = GPLv2 summary = The GNU data compression program. @@ -46,6 +46,7 @@ end
packages package %{name} + groups += Base Build end
package %{name}-debuginfo diff --git a/hdparm/hdparm.nm b/hdparm/hdparm.nm index be51efd..285b050 100644 --- a/hdparm/hdparm.nm +++ b/hdparm/hdparm.nm @@ -5,9 +5,9 @@
name = hdparm version = 9.37 -release = 1 +release = 2
-groups = Base Applications/Hardware +groups = Applications/Hardware url = http://sourceforge.net/projects/hdparm/ license = BSD summary = A utility for displaying and/or setting hard disk parameters. @@ -32,6 +32,7 @@ end
packages package %{name} + groups += Base end
package %{name}-debuginfo diff --git a/htop/htop.nm b/htop/htop.nm index 24e8590..b823f48 100644 --- a/htop/htop.nm +++ b/htop/htop.nm @@ -5,9 +5,9 @@
name = htop version = 1.0 -release = 1 +release = 2
-groups = Base Applications/System +groups = Applications/System url = http://htop.sourceforge.net/ license = GPL+ summary = Interactive process viewer. @@ -34,6 +34,7 @@ end
packages package %{name} + groups += Base end
package %{name}-debuginfo diff --git a/iasl/iasl.nm b/iasl/iasl.nm new file mode 100644 index 0000000..dd778ee --- /dev/null +++ b/iasl/iasl.nm @@ -0,0 +1,60 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = iasl +version = 20111123 +release = 2 +thisapp = acpica-unix-%{version} + +maintainer = Ben Schweikert ben.schweikert@ipfire.org +groups = Development/Languages +url = http://www.acpica.org/downloads/ +license = GPL+ +summary = Cross development C compiler. + +description + iasl compiles ASL (ACPI Source Language) into AML (ACPI Machine + Language), which is suitable for inclusion as a DSDT in system + firmware. It also can disassemble AML, for debugging purposes. +end + +source_dl = http://www.acpica.org/download/ + +build + requires + ncurses-devel + bison + flex + end + + prepare_cmds + # Remove -Werror from source. + find . -type f -exec sed -ie 's!-Werror!!g' {} ; + end + + build + # Only build the compiler. + cd compiler + + # Does not support parallel build. + make + end + + install + mkdir -pv %{BUILDROOT}/usr/bin/ + + # Only install compiler. + cd compiler + make install INSTALLDIR=%{BUILDROOT}/usr/bin + end +end + +packages + package %{name} + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/iasl/patches/Werror.patch b/iasl/patches/Werror.patch new file mode 100644 index 0000000..b882d4b --- /dev/null +++ b/iasl/patches/Werror.patch @@ -0,0 +1,10 @@ +--- a/compiler/Makefile 2011-12-04 19:47:42.324530514 +0100 ++++ b/compiler/Makefile 2011-12-04 19:48:00.946530074 +0100 +@@ -227,7 +227,6 @@ + -Wall \ + -Wbad-function-cast \ + -Wdeclaration-after-statement \ +- -Werror \ + -Wformat=2 \ + -Wmissing-declarations \ + -Wmissing-prototypes \ diff --git a/iasl/patches/iasl-20110922-as-needed.patch b/iasl/patches/iasl-20110922-as-needed.patch new file mode 100644 index 0000000..a507f74 --- /dev/null +++ b/iasl/patches/iasl-20110922-as-needed.patch @@ -0,0 +1,16 @@ + tools/acpiexec/Makefile | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/tools/acpiexec/Makefile b/tools/acpiexec/Makefile +index ba6b534..8435985 100644 +--- a/tools/acpiexec/Makefile ++++ b/tools/acpiexec/Makefile +@@ -269,7 +269,7 @@ CWARNINGFLAGS += \ + # Rules + # + $(PROG) : $(OBJECTS) +- $(CC) $(LDFLAGS) $(OBJECTS) -o $(PROG) ++ $(CC) $(OBJECTS) $(LDFLAGS) -o $(PROG) + $(COPYPROG) + + %.o : %.c $(HEADERS) $(ACPICA_HEADERS) diff --git a/iasl/patches/iasl-20110922-locale.patch b/iasl/patches/iasl-20110922-locale.patch new file mode 100644 index 0000000..920c409 --- /dev/null +++ b/iasl/patches/iasl-20110922-locale.patch @@ -0,0 +1,16 @@ +diff -Nuar acpica-unix-20110922.orig/compiler/Makefile acpica-unix-20110922/compiler/Makefile +--- acpica-unix-20110922.orig/compiler/Makefile 2011-09-22 15:59:34.000000000 +0000 ++++ acpica-unix-20110922/compiler/Makefile 2011-11-07 03:36:49.103281798 +0000 +@@ -258,10 +258,10 @@ + # + # Bison/Flex configuration + # +-YACC= bison ++YACC= LC_ALL=C bison + YFLAGS+= -v -d -y + +-LEX= flex ++LEX= LC_ALL=C flex + LFLAGS+= -i -s + + # diff --git a/iftop/iftop.nm b/iftop/iftop.nm index b6c651f..0f812e6 100644 --- a/iftop/iftop.nm +++ b/iftop/iftop.nm @@ -5,9 +5,9 @@
name = iftop version = 0.17 -release = 1 +release = 2
-groups = Base Applications/System +groups = Applications/System url = http://www.ex-parrot.com/pdw/iftop/ license = GPL+ summary = Interactive traffic listings @@ -32,7 +32,6 @@ end
packages package %{name} - end
package %{name}-debuginfo template DEBUGINFO diff --git a/initscripts/initscripts.nm b/initscripts/initscripts.nm index 2dc0203..a7bcb8d 100644 --- a/initscripts/initscripts.nm +++ b/initscripts/initscripts.nm @@ -6,9 +6,9 @@ name = initscripts epoch = 1 version = 2.99 -release = 11 +release = 12
-groups = Base System/Boot +groups = System/Boot url = license = GPLv3+ summary = The set of scripts that initalize the system. @@ -55,6 +55,8 @@ end
packages package %{name} + groups += Base + requires bash coreutils diff --git a/iproute2/iproute2.nm b/iproute2/iproute2.nm index 2260815..bf13e4a 100644 --- a/iproute2/iproute2.nm +++ b/iproute2/iproute2.nm @@ -5,9 +5,9 @@
name = iproute2 version = 2.6.39 -release = 1 +release = 2
-groups = Base Networking/Tools +groups = Networking/Tools url = http://www.linuxfoundation.org/en/Net:Iproute2 license = GPLv2+ summary = Advanced IP routing and network device configuration tools. @@ -41,6 +41,7 @@ end
packages package %{name} + groups += Base end
package %{name}-debuginfo diff --git a/iputils/iputils.nm b/iputils/iputils.nm index 52594ae..d45eb92 100644 --- a/iputils/iputils.nm +++ b/iputils/iputils.nm @@ -5,9 +5,9 @@
name = iputils version = s20071127 -release = 2 +release = 3
-groups = Base Networking/Tools +groups = Networking/Tools url = http://www.skbuff.net/iputils license = BSD summary = Network monitoring tools including ping. @@ -80,6 +80,7 @@ end
packages package %{name} + groups += Base end
package %{name}-debuginfo diff --git a/jwhois/jwhois.nm b/jwhois/jwhois.nm index 5fcf81a..cfe605a 100644 --- a/jwhois/jwhois.nm +++ b/jwhois/jwhois.nm @@ -5,9 +5,9 @@
name = jwhois version = 4.0 -release = 0 +release = 1
-groups = Base Applications/Internet +groups = Applications/Internet url = http://www.gnu.org/software/jwhois/ license = GPLv3 summary = Internet whois/nicname client. @@ -41,7 +41,6 @@ end
packages package %{name} - end
package %{name}-debuginfo template DEBUGINFO diff --git a/less/less.nm b/less/less.nm index 3fa280e..a6ffab1 100644 --- a/less/less.nm +++ b/less/less.nm @@ -5,9 +5,9 @@
name = less version = 444 -release = 1 +release = 2
-groups = Base Applications/Text +groups = Applications/Text url = http://www.greenwoodsoftware.com/less/ license = GPLv3+ summary = A text file browser similar to more, but better. @@ -45,6 +45,7 @@ end
packages package %{name} + groups += Base end
package %{name}-debuginfo diff --git a/libtool/libtool.nm b/libtool/libtool.nm index cd72e6d..1c8fdd2 100644 --- a/libtool/libtool.nm +++ b/libtool/libtool.nm @@ -5,9 +5,9 @@
name = libtool version = 2.4.2 -release = 1 +release = 2
-groups = Build System/Libraries +groups = System/Libraries url = http://www.gnu.org/software/libtool/ license = GPLv2+ and LGPLv2+ and GFDL summary = Runtime libraries for GNU Libtool Dynamic Module Loader. @@ -23,6 +23,8 @@ source_dl = http://ftp.gnu.org/gnu/libtool/
packages package %{name} + groups += Build + end
package %{name}-libs template LIBS diff --git a/logrotate/logrotate.nm b/logrotate/logrotate.nm index cdafc91..21d8677 100644 --- a/logrotate/logrotate.nm +++ b/logrotate/logrotate.nm @@ -5,9 +5,9 @@
name = logrotate version = 3.7.7 -release = 2 +release = 3
-groups = Base System/Base +groups = System/Base url = https://fedorahosted.org/releases/l/o/logrotate/ license = GPL+ summary = Rotates, compresses, removes and mails system log files. @@ -53,6 +53,7 @@ end
packages package %{name} + groups += Base end
package %{name}-debuginfo diff --git a/lsof/lsof.nm b/lsof/lsof.nm index d28871a..bff08ab 100644 --- a/lsof/lsof.nm +++ b/lsof/lsof.nm @@ -5,9 +5,9 @@
name = lsof version = 4.82 -release = 1 +release = 2
-groups = Base Development/Debuggers +groups = Development/Debuggers url = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof license = zlib summary = A utility which lists open files on a Linux/UNIX system. @@ -45,7 +45,6 @@ end
packages package %{name} - end
package %{name}-debuginfo template DEBUGINFO diff --git a/make/make.nm b/make/make.nm index c8eac07..2a8fb0a 100644 --- a/make/make.nm +++ b/make/make.nm @@ -5,10 +5,10 @@
name = make version = 3.81 -release = 1 +release = 2
maintainer = Michael Tremer michael.tremer@ipfire.org -groups = Build Development/Tools +groups = Development/Tools url = http://www.gnu.org/software/make/ license = GPLv2+ summary = A GNU tool which simplifies the build process for users. @@ -37,6 +37,8 @@ end
packages package %{name} + groups += Build + end
package %{name}-debuginfo template DEBUGINFO diff --git a/man-db/man-db.nm b/man-db/man-db.nm index 05b9e66..ac06611 100644 --- a/man-db/man-db.nm +++ b/man-db/man-db.nm @@ -5,9 +5,9 @@
name = man-db version = 2.6.0.2 -release = 2 +release = 3
-groups = Base Documentation +groups = Documentation url = http://bzr.savannah.gnu.org/r/man-db/ license = GPL summary = man-db is an on-line manual database. @@ -56,6 +56,8 @@ end
packages package %{name} + groups += Base + requires groff less diff --git a/memtest86+/memtest86+.nm b/memtest86+/memtest86+.nm index 8664482..ee08866 100644 --- a/memtest86+/memtest86+.nm +++ b/memtest86+/memtest86+.nm @@ -5,9 +5,9 @@
name = memtest86+ version = 4.20 -release = 1 +release = 2
-groups = Base System/Base +groups = System/Base url = http://www.memtest.org/ license = GPLv2 summary = Stand-alone memory tester for x86 and x86-64 computers. diff --git a/mstpd/mstpd.nm b/mstpd/mstpd.nm index 8eb7c80..3e886d9 100644 --- a/mstpd/mstpd.nm +++ b/mstpd/mstpd.nm @@ -5,8 +5,8 @@
name = mstpd version = 0.01 -svn_ver = 20 -release = 0.2-svn%{svn_ver}.1 +svn_ver = 22 +release = 0.3-svn%{svn_ver}.1 thisapp = %{name}-%{version}-svn%{svn_ver}
groups = Networking/Tools diff --git a/net-tools/net-tools.nm b/net-tools/net-tools.nm index 084d5d8..10ce626 100644 --- a/net-tools/net-tools.nm +++ b/net-tools/net-tools.nm @@ -5,9 +5,9 @@
name = net-tools version = 1.60 -release = 1 +release = 2
-groups = Base Sytem/Base +groups = System/Base url = http://net-tools.berlios.de/ license = GPL+ summary = Basic networking tools. @@ -152,6 +152,8 @@ end
packages package %{name} + groups += Base + end
package %{name}-debuginfo template DEBUGINFO diff --git a/passwd/passwd.nm b/passwd/passwd.nm index 13061a9..cc1958c 100644 --- a/passwd/passwd.nm +++ b/passwd/passwd.nm @@ -5,9 +5,9 @@
name = passwd version = 0.76 -release = 1 +release = 2
-groups = Base System/Base +groups = System/Base url = http://fedorahosted.org/passwd license = BSD summary = An utility for setting or changing passwords using PAM. @@ -43,6 +43,8 @@ end
packages package %{name} + groups += Base + end
package %{name}-debuginfo template DEBUGINFO diff --git a/patch/patch.nm b/patch/patch.nm index c79094f..ecdafac 100644 --- a/patch/patch.nm +++ b/patch/patch.nm @@ -5,9 +5,9 @@
name = patch version = 2.6.1 -release = 1 +release = 2
-groups = Build Development/Tools +groups = Development/Tools url = http://www.gnu.org/software/patch/patch.html license = GPLv2+ summary = Utility for modifying/upgrading files. @@ -42,6 +42,8 @@ end
packages package %{name} + groups += Build + end
package %{name}-debuginfo template DEBUGINFO diff --git a/pciutils/pciutils.nm b/pciutils/pciutils.nm index 3962892..d04677a 100644 --- a/pciutils/pciutils.nm +++ b/pciutils/pciutils.nm @@ -5,10 +5,9 @@
name = pciutils version = 3.1.7 -release = 1 +release = 2
groups = System/Base -groups-pciutils = Base %{groups} url = http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml license = GPLv2+ summary = PCI bus related utilities. @@ -41,6 +40,7 @@ end
packages package %{name} + groups += Base end
package %{name}-libs diff --git a/pkg-config/pkg-config.nm b/pkg-config/pkg-config.nm index ef0318a..bc36a26 100644 --- a/pkg-config/pkg-config.nm +++ b/pkg-config/pkg-config.nm @@ -5,9 +5,9 @@
name = pkg-config version = 0.25 -release = 1 +release = 2
-groups = Build Development/Tools +groups = Development/Tools url = http://pkg-config.freedesktop.org/ license = GPLv2 summary = A tool for determining compilation options. @@ -37,6 +37,8 @@ end
packages package %{name} + groups += Build + # Say we provide an alternative spelling of the package name. provides = pkgconfig end diff --git a/procps/procps.nm b/procps/procps.nm index c25c6ca..24748a4 100644 --- a/procps/procps.nm +++ b/procps/procps.nm @@ -5,9 +5,9 @@
name = procps version = 3.2.8 -release = 2 +release = 3
-groups = Base Applications/System +groups = Applications/System url = http://procps.sourceforge.net/ license = GPLv2+ and LGPLv2+ summary = System and process monitoring utilities. @@ -41,6 +41,8 @@ end
packages package %{name} + groups += Base + end
package %{name}-debuginfo template DEBUGINFO diff --git a/psmisc/psmisc.nm b/psmisc/psmisc.nm index 3e9acad..c91b316 100644 --- a/psmisc/psmisc.nm +++ b/psmisc/psmisc.nm @@ -5,9 +5,9 @@
name = psmisc version = 22.10 -release = 1 +release = 2
-groups = Base Applications/System +groups = Applications/System url = http://sourceforge.net/projects/psmisc license = GPLv2+ summary = Utilities for managing processes on your system. @@ -36,6 +36,8 @@ end
packages package %{name} + groups += Base + end
package %{name}-debuginfo template DEBUGINFO diff --git a/rsyslog/rsyslog.nm b/rsyslog/rsyslog.nm index d076187..1f2aef3 100644 --- a/rsyslog/rsyslog.nm +++ b/rsyslog/rsyslog.nm @@ -5,9 +5,9 @@
name = rsyslog version = 5.8.6 -release = 1 +release = 2
-groups = Base System/Daemons +groups = System/Daemons url = http://www.rsyslog.com/ license = GPLv3+ summary = Enhanced system logging and kernel message trapping daemon. diff --git a/sdl/sdl.nm b/sdl/sdl.nm deleted file mode 100644 index 5e22e05..0000000 --- a/sdl/sdl.nm +++ /dev/null @@ -1,42 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = SDL -version = 1.2.14 -release = 1 - -groups = System/Libraries -url = http://www.libsdl.org/ -license = LGPLv2+ -summary = A cross-platform multimedia library. - -description - Simple DirectMedia Layer (SDL) is a cross-platform multimedia library - designed to provide fast access to the graphics frame buffer and audio - device. -end - -source_dl = http://www.libsdl.org/release/ - -build - requires - directfb-devel - libusb-compat-devel - pkg-config - end -end - -packages - package %{name} - end - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/sed/sed.nm b/sed/sed.nm index 5bbb61a..0c43fbb 100644 --- a/sed/sed.nm +++ b/sed/sed.nm @@ -5,9 +5,9 @@
name = sed version = 4.2.1 -release = 1 +release = 2
-groups = Base Build Applications/Text +groups = Applications/Text url = http://sed.sourceforge.net/ license = GPLv2+ summary = A GNU stream text editor. @@ -39,6 +39,7 @@ end
packages package %{name} + groups += Base Build end
package %{name}-debuginfo diff --git a/setup/setup.nm b/setup/setup.nm index 18d3738..891af40 100644 --- a/setup/setup.nm +++ b/setup/setup.nm @@ -5,7 +5,8 @@
name = setup version = 3.0 -release = 3 +release = 4 +arch = noarch
groups = Base Build System/Base url = @@ -66,8 +67,4 @@ packages /etc/shells end end - - package %{name}-debuginfo - template DEBUGINFO - end end diff --git a/shadow-utils/shadow-utils.nm b/shadow-utils/shadow-utils.nm index 66cd466..8de9700 100644 --- a/shadow-utils/shadow-utils.nm +++ b/shadow-utils/shadow-utils.nm @@ -5,11 +5,11 @@
name = shadow-utils version = 4.1.4.3 -release = 5 +release = 6 thisapp = shadow-%{version}
maintainer = Michael Tremer michael.tremer@ipfire.org -groups = Base System/Base +groups = System/Base url = http://pkg-shadow.alioth.debian.org/ license = GPLv2+ summary = Utilities to deal with user accounts. @@ -68,6 +68,8 @@ end
packages package %{name} + groups += Base + obsoletes += shadow<%{thisver} provides += shadow=%{thisver}
diff --git a/sudo/sudo.nm b/sudo/sudo.nm index 92d2d1e..139157b 100644 --- a/sudo/sudo.nm +++ b/sudo/sudo.nm @@ -5,9 +5,9 @@
name = sudo version = 1.8.3 -release = 1 +release = 2
-groups = Base Applications/System +groups = Applications/System url = http://www.sudo.ws/sudo/download.html license = BSD summary = Allows restricted root access for specified users. @@ -58,6 +58,7 @@ end
packages package %{name} + groups += Base end
package %{name}-debuginfo diff --git a/system-release/system-release.nm b/system-release/system-release.nm index 24f0a56..afc0609 100644 --- a/system-release/system-release.nm +++ b/system-release/system-release.nm @@ -64,6 +64,5 @@ end packages package %{name} provides = system-release - obsoletes = system-release end end diff --git a/tar/tar.nm b/tar/tar.nm index b4fb031..9287bf2 100644 --- a/tar/tar.nm +++ b/tar/tar.nm @@ -5,9 +5,9 @@
name = tar version = 1.26 -release = 1 +release = 2
-groups = Base Build System/Packaging +groups = System/Packaging url = http://www.gnu.org/software/tar/ license = GPLv3+ summary = A GNU file archiving program. @@ -54,6 +54,7 @@ end
packages package %{name} + groups += Base Build end
package %{name}-debuginfo diff --git a/vim/vim.nm b/vim/vim.nm index 5ce9fd8..d826fb6 100644 --- a/vim/vim.nm +++ b/vim/vim.nm @@ -5,9 +5,9 @@
name = vim version = 7.3 -release = 1 +release = 2
-groups = Base Applications/Editors +groups = Applications/Editors url = http://www.vim.org license = PublicDomain/Charityware summary = Very feature- and powerful editor. @@ -52,6 +52,7 @@ end
packages package %{name} + groups += Base end
package %{name}-debuginfo diff --git a/which/which.nm b/which/which.nm index 5457912..3f9a756 100644 --- a/which/which.nm +++ b/which/which.nm @@ -5,9 +5,9 @@
name = which version = 2.20 -release = 1 +release = 2
-groups = Base Build Applications/System +groups = Applications/System url = http://www.xs4all.nl/~carlo17/which/ license = GPLv3 summary = Displays where a particular program in your path is located. @@ -21,6 +21,8 @@ source_dl = http://carlo17.home.xs4all.nl/which/
packages package %{name} + groups += Base Build + end
package %{name}-debuginfo template DEBUGINFO diff --git a/xen/patches/00-xen-detect.patch b/xen/patches/00-xen-detect.patch deleted file mode 100644 index 0b485f7..0000000 --- a/xen/patches/00-xen-detect.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -r 23c068b10923 tools/misc/xen-detect.c ---- a/tools/misc/xen-detect.c Wed Jun 15 16:16:41 2011 +0100 -+++ b/tools/misc/xen-detect.c Wed Jun 15 20:14:30 2011 +0100 -@@ -33,43 +33,46 @@ - #include <unistd.h> - #include <getopt.h> - --static void cpuid(uint32_t idx, -- uint32_t *eax, -- uint32_t *ebx, -- uint32_t *ecx, -- uint32_t *edx, -- int pv_context) -+static void cpuid(uint32_t idx, uint32_t *regs, int pv_context) - { - asm volatile ( -- "test %1,%1 ; jz 1f ; ud2a ; .ascii "xen" ; 1: cpuid" -- : "=a" (*eax), "=b" (*ebx), "=c" (*ecx), "=d" (*edx) -- : "0" (idx), "1" (pv_context) ); -+#ifdef __i386__ -+#define R(x) "%%e"#x"x" -+#else -+#define R(x) "%%r"#x"x" -+#endif -+ "push "R(a)"; push "R(b)"; push "R(c)"; push "R(d)"\n\t" -+ "test %1,%1 ; jz 1f ; ud2a ; .ascii "xen" ; 1: cpuid\n\t" -+ "mov %%eax,(%2); mov %%ebx,4(%2)\n\t" -+ "mov %%ecx,8(%2); mov %%edx,12(%2)\n\t" -+ "pop "R(d)"; pop "R(c)"; pop "R(b)"; pop "R(a)"\n\t" -+ : : "a" (idx), "c" (pv_context), "S" (regs) : "memory" ); - } - - static int check_for_xen(int pv_context) - { -- uint32_t eax, ebx, ecx, edx; -+ uint32_t regs[4]; - char signature[13]; - uint32_t base; - - for ( base = 0x40000000; base < 0x40010000; base += 0x100 ) - { -- cpuid(base, &eax, &ebx, &ecx, &edx, pv_context); -+ cpuid(base, regs, pv_context); - -- *(uint32_t *)(signature + 0) = ebx; -- *(uint32_t *)(signature + 4) = ecx; -- *(uint32_t *)(signature + 8) = edx; -+ *(uint32_t *)(signature + 0) = regs[1]; -+ *(uint32_t *)(signature + 4) = regs[2]; -+ *(uint32_t *)(signature + 8) = regs[3]; - signature[12] = '\0'; - -- if ( !strcmp("XenVMMXenVMM", signature) && (eax >= (base + 2)) ) -+ if ( !strcmp("XenVMMXenVMM", signature) && (regs[0] >= (base + 2)) ) - goto found; - } - - return 0; - - found: -- cpuid(base + 1, &eax, &ebx, &ecx, &edx, pv_context); -- return eax; -+ cpuid(base + 1, regs, pv_context); -+ return regs[0]; - } - - static jmp_buf sigill_jmp; diff --git a/xen/patches/02-patch.patch0 b/xen/patches/02-patch.patch0 new file mode 100644 index 0000000..75d565d --- /dev/null +++ b/xen/patches/02-patch.patch0 @@ -0,0 +1,23 @@ +diff -duNrH tools/firmware/etherboot/patches~/gentoo-hardened.patch xen-4.1.0/tools/firmware/etherboot/patches/gentoo-hardened.patch +--- tools/firmware/etherboot~/patches/gentoo-hardened.patch 1970-01-01 01:00:00.000000000 +0100 ++++ tools/firmware/etherboot/patches/gentoo-hardened.patch 2011-03-27 17:45:13.929697782 +0200 +@@ -0,0 +1,11 @@ ++--- ipxe/src/Makefile~ 2011-03-27 17:41:52.000000000 +0200 +++++ ipxe/src/Makefile 2011-03-27 17:43:20.869446433 +0200 ++@@ -4,7 +4,7 @@ ++ # ++ ++ CLEANUP := ++-CFLAGS := +++CFLAGS := -nopie ++ ASFLAGS := ++ LDFLAGS := ++ MAKEDEPS := Makefile +diff -duNrH tools/firmware/etherboot~/patches/series xen-4.1.0/tools/firmware/etherboot/patches/series +--- tools/firmware/etherboot~/patches/series 2011-03-25 11:42:50.000000000 +0100 ++++ tools/firmware/etherboot/patches/series 2011-03-27 17:45:45.140446216 +0200 +@@ -1,3 +1,4 @@ + boot_prompt_option.patch + gpxe-git-0edf2405b457 + gpxe-git-a803ef3dfeac ++gentoo-hardened.patch diff --git a/xen/patches/xen-ipxe.patch0 b/xen/patches/xen-ipxe.patch0 new file mode 100644 index 0000000..d544c78 --- /dev/null +++ b/xen/patches/xen-ipxe.patch0 @@ -0,0 +1,23 @@ +--- tools/firmware/etherboot/Makefile 2011-12-11 16:57:04.609076813 +0100 ++++ tools/firmware/etherboot/Makefile 2011-12-11 16:54:16.211074495 +0100 +@@ -35,13 +35,13 @@ + mv -f $@.new $@ + + $T: +- if ! wget -O _$T $(IPXE_TARBALL_URL); then \ +- $(GIT) clone $(IPXE_GIT_URL) $D.git; \ +- (cd $D.git && $(GIT) archive --format=tar --prefix=$D/ \ +- $(IPXE_GIT_TAG) | gzip >../_$T); \ +- rm -rf $D.git; \ +- fi +- mv _$T $T ++# if ! wget -O _$T $(IPXE_TARBALL_URL); then \ ++# $(GIT) clone $(IPXE_GIT_URL) $D.git; \ ++# (cd $D.git && $(GIT) archive --format=tar --prefix=$D/ \ ++# $(IPXE_GIT_TAG) | gzip >../_$T); \ ++# rm -rf $D.git; \ ++# fi ++# mv _$T $T + + $D/src/arch/i386/Makefile: $T Config + rm -rf $D diff --git a/xen/xen.nm b/xen/xen.nm index ab41445..72567ec 100644 --- a/xen/xen.nm +++ b/xen/xen.nm @@ -4,8 +4,8 @@ ###############################################################################
name = xen -version = 4.1.1 -release = 4 +version = 4.1.2 +release = 3
maintainer = Ben Schweikert ben.schweikert@ipfire.org groups = Applications/Virtualization @@ -19,19 +19,23 @@ description feature set for virtualization. end
-source_dl = -sources = %{thisapp}.tar.gz +source_dl = http://bits.xensource.com/oss-xen/release/%%7Bversion%7D/ +sources = %{thisapp}.tar.gz xen-utils-0.1.tar.bz2
build requires + chrpath + dev86 gettext-devel + iasl kernel-headers libuuid-devel ncurses-devel openssl-devel python python-devel - sdl-devel + SDL + SDL-devel texinfo xorg-x11-proto-devel wget @@ -39,12 +43,9 @@ build end
prepare_cmds - # Following two lines are disabling HVM. HVM does not work because \ - # of some PIE errors we get when we try to build the firmware part \ - # needed for different architektures. - sed -i -e '/^CONFIG_IOEMU := y$/d' config/*.mk - sed -i -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' tools/Makefile - + tar -xvf %{DIR_DL}/xen-utils-0.1.tar.bz2 + mv tools/firmware/etherboot/ipxe-git-v1.0.0.tar.gz tools/firmware/etherboot/ipxe.tar.gz + mv extras/mini-os/newlib-1.16.0.tar.gz stubdom/ rm -f Config.mk~ end
@@ -52,10 +53,11 @@ build xen tools
make_install_targets +=\ - xen install-tools + install-xen install-tools
install_cmds rm -R %{BUILDROOT}/etc/init.d + chrpath --delete %{BUILDROOT}/usr/lib/xen/bin/qemu-dm end end
hooks/post-receive -- IPFire 3.x development tree
-
git＠ipfire.org