[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. c6fb66f9566951124ccd66f1592f87c3ec60ca85
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 c6fb66f9566951124ccd66f1592f87c3ec60ca85 (commit) via ba3c038fa9aba1fe310868ec934ea426409fa27c (commit) via 1e2914a72a796552ef9320fcd6d23ca0315fbc65 (commit) via f8cd422890c02cb2a6847b0cf905030b2f414eb3 (commit) via e882664cd36ac19040a8201b16debf6df211270d (commit) via 74edf1b485dc6bb854c62569c15804e374501474 (commit) via 1e68fc47057e7e550ad8d2caaa494dff3606c308 (commit) via e269aa4de7d45dd67de9586c68c4862b1fddcf8b (commit) via 84f2eb679e63262aa666f827a9e788bd4d9286a7 (commit) via dc3a0a1db59167b7e35ada56255edfad4bb23717 (commit) via 4fb24c6b8ac5626169b8c90edebbb352316b8d9a (commit) via 7c75667960584cfd2c1a25f4bc62073fa0457f93 (commit) via 21ec1f00ce49d7fcde2f79247987da0edae93fed (commit) via cd3027b1a955faf68ef74dea54e2bf524998f6f2 (commit) via 49561898ec44c0317550508ca442fee90680c793 (commit) via d696135b1ea6c9e27fbe9d9d38aae1650d96b395 (commit) via 4eb2b603a8b91f54a386a0279ae455f059c8e8e8 (commit) from d0b0931b6a6fdc712f33d020223ced849f264595 (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 c6fb66f9566951124ccd66f1592f87c3ec60ca85 Merge: 1e2914a ba3c038 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Nov 6 22:12:41 2010 +0100
Merge remote branch 'stevee/libcap-ng' into next
commit ba3c038fa9aba1fe310868ec934ea426409fa27c Author: Schantl Stefan Stevee@ipfire.org Date: Sat Nov 6 19:42:27 2010 +0100
libcap-ng: Update to 0.6.5.
This fixes #84.
commit 1e2914a72a796552ef9320fcd6d23ca0315fbc65 Merge: f8cd422 74edf1b Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Nov 6 18:44:23 2010 +0100
Merge remote branch 'stevee/util-linux-ng' into next
commit f8cd422890c02cb2a6847b0cf905030b2f414eb3 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Nov 6 15:10:28 2010 +0100
python-qtermwidget: Add patch to remove SEGV in the module.
Fixes #80. It has been a hard one.
commit e882664cd36ac19040a8201b16debf6df211270d Author: Schantl Stefan Stevee@ipfire.org Date: Sat Nov 6 15:00:28 2010 +0100
xorg-x11-xkb-utils: Provide more binaries.
This fixes #86.
commit 74edf1b485dc6bb854c62569c15804e374501474 Author: Schantl Stefan Stevee@ipfire.org Date: Fri Nov 5 17:19:26 2010 +0100
xfsprogs: Update dependencies.
commit 1e68fc47057e7e550ad8d2caaa494dff3606c308 Author: Schantl Stefan Stevee@ipfire.org Date: Fri Nov 5 17:15:08 2010 +0100
xen: Update dependencies.
commit e269aa4de7d45dd67de9586c68c4862b1fddcf8b Author: Schantl Stefan Stevee@ipfire.org Date: Fri Nov 5 17:10:32 2010 +0100
udev: Update dependencies.
commit 84f2eb679e63262aa666f827a9e788bd4d9286a7 Author: Schantl Stefan Stevee@ipfire.org Date: Fri Nov 5 17:08:52 2010 +0100
reiser4progs: Update dependencies.
commit dc3a0a1db59167b7e35ada56255edfad4bb23717 Author: Schantl Stefan Stevee@ipfire.org Date: Fri Nov 5 17:05:03 2010 +0100
qemu: Update dependencies.
commit 4fb24c6b8ac5626169b8c90edebbb352316b8d9a Merge: 7c75667 236898d Author: Schantl Stefan Stevee@ipfire.org Date: Thu Nov 4 16:50:55 2010 +0100
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into util-linux-ng
commit 7c75667960584cfd2c1a25f4bc62073fa0457f93 Author: Schantl Stefan Stevee@ipfire.org Date: Thu Nov 4 16:47:50 2010 +0100
parted: Update dependencies.
commit 21ec1f00ce49d7fcde2f79247987da0edae93fed Author: Schantl Stefan Stevee@ipfire.org Date: Thu Nov 4 15:49:53 2010 +0100
os-prober: Update dependencies.
commit cd3027b1a955faf68ef74dea54e2bf524998f6f2 Author: Schantl Stefan Stevee@ipfire.org Date: Thu Nov 4 15:43:32 2010 +0100
gupnp: Update dependencies.
commit 49561898ec44c0317550508ca442fee90680c793 Author: Schantl Stefan Stevee@ipfire.org Date: Thu Nov 4 15:40:56 2010 +0100
e2fsprogs: Update dependencies.
commit d696135b1ea6c9e27fbe9d9d38aae1650d96b395 Author: Schantl Stefan Stevee@ipfire.org Date: Thu Nov 4 15:36:28 2010 +0100
btrfs-progs: Update dependecies.
commit 4eb2b603a8b91f54a386a0279ae455f059c8e8e8 Author: Schantl Stefan Stevee@ipfire.org Date: Thu Nov 4 15:34:40 2010 +0100
util-linux-ng: Split libraries into own packages.
Splited into seperate packages for: * libuuid & libuuid-devel * libblkid & libblkid-devel * libmount & libmount-devel
-----------------------------------------------------------------------
Summary of changes: pkgs/core/btrfs-progs/btrfs-progs.nm | 2 +- pkgs/core/e2fsprogs/e2fsprogs.nm | 2 +- pkgs/core/gupnp/gupnp.nm | 4 +- pkgs/core/libcap-ng/libcap-ng.nm | 2 +- .../libcap-ng/patches/libcap-ng-0.6.5-device.patch | 41 ------------- pkgs/core/os-prober/os-prober.nm | 2 +- pkgs/core/parted/parted.nm | 2 +- .../python-qtermwidget/patches/addStartShell.patch | 12 ++++ pkgs/core/python-qtermwidget/python-qtermwidget.nm | 2 +- pkgs/core/qemu/qemu.nm | 4 +- pkgs/core/reiser4progs/reiser4progs.nm | 2 +- pkgs/core/udev/udev.nm | 4 +- pkgs/core/util-linux-ng/util-linux-ng.nm | 64 +++++++++++++++++++- pkgs/core/xen/xen.nm | 4 +- pkgs/core/xfsprogs/xfsprogs.nm | 4 +- pkgs/core/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm | 17 ++++- 16 files changed, 105 insertions(+), 63 deletions(-) delete mode 100644 pkgs/core/libcap-ng/patches/libcap-ng-0.6.5-device.patch create mode 100644 pkgs/core/python-qtermwidget/patches/addStartShell.patch
Difference in files: diff --git a/pkgs/core/btrfs-progs/btrfs-progs.nm b/pkgs/core/btrfs-progs/btrfs-progs.nm index a1e7ca6..ac733c8 100644 --- a/pkgs/core/btrfs-progs/btrfs-progs.nm +++ b/pkgs/core/btrfs-progs/btrfs-progs.nm @@ -34,7 +34,7 @@ PKG_URL = http://btrfs.wiki.kernel.org/index.php/Main_Page PKG_LICENSE = GPLv2 PKG_SUMMARY = Userspace programs for btrfs.
-PKG_BUILD_DEPS+= util-linux-ng-devel +PKG_BUILD_DEPS+= libuuid-devel
define PKG_DESCRIPTION The btrfs-progs package provides all the userpsace programs needed to create, \ diff --git a/pkgs/core/e2fsprogs/e2fsprogs.nm b/pkgs/core/e2fsprogs/e2fsprogs.nm index 12accd3..498a4f6 100644 --- a/pkgs/core/e2fsprogs/e2fsprogs.nm +++ b/pkgs/core/e2fsprogs/e2fsprogs.nm @@ -42,7 +42,7 @@ define PKG_DESCRIPTION and third extended (ext2/ext3) filesystems. endef
-PKG_BUILD_DEPS+= pkg-config util-linux-ng-devel +PKG_BUILD_DEPS+= libblkid-devel libuuid-devel pkg-config
PKG_TARBALL = $(THISAPP).tar.gz
diff --git a/pkgs/core/gupnp/gupnp.nm b/pkgs/core/gupnp/gupnp.nm index 126ba86..ae12a23 100644 --- a/pkgs/core/gupnp/gupnp.nm +++ b/pkgs/core/gupnp/gupnp.nm @@ -34,8 +34,8 @@ PKG_URL = http://www.gupnp.org PKG_LICENSE = LGPL PKG_SUMMARY = An UPNP framework.
-PKG_BUILD_DEPS+= glib2-devel gssdp-devel libsoup-devel libxml2-devel \ - pkg-config util-linux-ng-devel +PKG_BUILD_DEPS+= glib2-devel gssdp-devel libsoup-devel libuuid-devel \ + libxml2-devel pkg-config
define PKG_DESCRIPTION GUPnP is an object-oriented open source framework for creating UPnP\ diff --git a/pkgs/core/libcap-ng/libcap-ng.nm b/pkgs/core/libcap-ng/libcap-ng.nm index daca254..189f2a0 100644 --- a/pkgs/core/libcap-ng/libcap-ng.nm +++ b/pkgs/core/libcap-ng/libcap-ng.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include
PKG_NAME = libcap-ng -PKG_VER = 0.6.4 +PKG_VER = 0.6.5 PKG_REL = 0
PKG_MAINTAINER = diff --git a/pkgs/core/libcap-ng/patches/libcap-ng-0.6.5-device.patch b/pkgs/core/libcap-ng/patches/libcap-ng-0.6.5-device.patch deleted file mode 100644 index 7effd72..0000000 --- a/pkgs/core/libcap-ng/patches/libcap-ng-0.6.5-device.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -urp libcap-ng-0.6.5.orig/utils/filecap.c libcap-ng-0.6.5/utils/filecap.c ---- libcap-ng-0.6.5.orig/utils/filecap.c 2010-06-17 13:19:21.000000000 -0400 -+++ libcap-ng-0.6.5/utils/filecap.c 2010-06-17 14:25:07.000000000 -0400 -@@ -41,12 +41,15 @@ static void usage(void) - exit(1); - } - --static int check_file(const char *file, -- const struct stat *sb_unused __attribute__ ((unused)), -- int flag_unused __attribute__ ((unused)), -+static int check_file(const char *fpath, -+ const struct stat *sb, -+ int typeflag_unused __attribute__ ((unused)), - struct FTW *s_unused __attribute__ ((unused))) - { -- int fd = open(file, O_RDONLY); -+ if (S_ISREG(sb->st_mode) == 0) -+ return FTW_CONTINUE; -+ -+ int fd = open(fpath, O_RDONLY); - if (fd >= 0) { - capng_results_t rc; - -@@ -58,7 +61,7 @@ static int check_file(const char *file, - header = 1; - printf("%-20s capabilities\n", "file"); - } -- printf("%s ", file); -+ printf("%s ", fpath); - if (rc == CAPNG_FULL) - printf("full"); - else -@@ -68,7 +71,7 @@ static int check_file(const char *file, - } - close(fd); - } -- return 0; -+ return FTW_CONTINUE; - } - - diff --git a/pkgs/core/os-prober/os-prober.nm b/pkgs/core/os-prober/os-prober.nm index d2eb74d..b37f80f 100644 --- a/pkgs/core/os-prober/os-prober.nm +++ b/pkgs/core/os-prober/os-prober.nm @@ -35,7 +35,7 @@ PKG_LICENSE = GPL PKG_SUMMARY = Utility to detect other OSes on a set of drives.
PKG_BUILD_DEPS+= dmraid-devel libdevmapper-devel libudev-devel \ - util-linux-ng-devel + libuuid-devel
define PKG_DESCRIPTION os-prober is a spinoff of debian-installer. One of the installer's features \ diff --git a/pkgs/core/parted/parted.nm b/pkgs/core/parted/parted.nm index 82083ed..73a93e9 100644 --- a/pkgs/core/parted/parted.nm +++ b/pkgs/core/parted/parted.nm @@ -34,7 +34,7 @@ PKG_URL = http://www.gnu.org/software/parted PKG_LICENSE = GPLv3+ PKG_SUMMARY = The GNU disk partition manipulation program.
-PKG_BUILD_DEPS+= libdevmapper-devel readline-devel util-linux-ng-devel +PKG_BUILD_DEPS+= libdevmapper-devel libuuid-devel readline-devel
define PKG_DESCRIPTION The GNU Parted program allows you to create, destroy, resize, move, \ diff --git a/pkgs/core/python-qtermwidget/patches/addStartShell.patch b/pkgs/core/python-qtermwidget/patches/addStartShell.patch new file mode 100644 index 0000000..7ff30c4 --- /dev/null +++ b/pkgs/core/python-qtermwidget/patches/addStartShell.patch @@ -0,0 +1,12 @@ +Index: qtermwidget/qtermwidget.sip +=================================================================== +--- qtermwidget.orig/qtermwidget.sip ++++ qtermwidget/qtermwidget.sip +@@ -19,6 +19,7 @@ public: + ScrollBarLeft=1, + ScrollBarRight=2 + }; ++ void startShellProgram(); + void setTerminalFont(QFont &font); + void setShellProgram(QString &progname); + void setArgs(QStringList &args); diff --git a/pkgs/core/python-qtermwidget/python-qtermwidget.nm b/pkgs/core/python-qtermwidget/python-qtermwidget.nm index 2e80268..70713fe 100644 --- a/pkgs/core/python-qtermwidget/python-qtermwidget.nm +++ b/pkgs/core/python-qtermwidget/python-qtermwidget.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = python-qtermwidget PKG_VER = 0.1.2 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = Development/Languages diff --git a/pkgs/core/qemu/qemu.nm b/pkgs/core/qemu/qemu.nm index eb8fc69..c960b6c 100644 --- a/pkgs/core/qemu/qemu.nm +++ b/pkgs/core/qemu/qemu.nm @@ -34,8 +34,8 @@ PKG_URL = http://www.linux-kvm.org/page/Main_Page PKG_LICENSE = GPLv2+ PKG_SUMMARY = QEMU is a generic and open source machine emulator and virtualizer.
-PKG_BUILD_DEPS+= libcurl-devel gnutls-devel ncurses-devel pciutils-devel \ - sdl-devel util-linux-ng-devel +PKG_BUILD_DEPS+= libcurl-devel libuuid-devel gnutls-devel ncurses-devel \ + pciutils-devel sdl-devel
define PKG_DESCRIPTION QEMU is a processor emulator that relies on dynamic binary translation \ diff --git a/pkgs/core/reiser4progs/reiser4progs.nm b/pkgs/core/reiser4progs/reiser4progs.nm index 03eaf77..bd51363 100644 --- a/pkgs/core/reiser4progs/reiser4progs.nm +++ b/pkgs/core/reiser4progs/reiser4progs.nm @@ -35,7 +35,7 @@ PKG_LICENSE = GPL PKG_SUMMARY = Administration utilities for the Reiser4 filesystem.
PKG_BUILD_DEPS+= autoconf automake e2fsprogs-devel libaal-devel libtool \ - ncurses-devel readline-devel util-linux-ng-devel + libuuid-devel ncurses-devel readline-devel
define PKG_DESCRIPTION The filesystem utilities for the reiser4 filesystem, including: \ diff --git a/pkgs/core/udev/udev.nm b/pkgs/core/udev/udev.nm index 045c7bb..0f42999 100644 --- a/pkgs/core/udev/udev.nm +++ b/pkgs/core/udev/udev.nm @@ -34,8 +34,8 @@ PKG_URL = ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ PKG_LICENSE = GPLv2+ PKG_SUMMARY = A userspace implementation of devfs.
-PKG_BUILD_DEPS+= glib2-devel gperf kbd libacl-devel libusb-compat-devel \ - pciutils pkg-config usbutils util-linux-ng-devel +PKG_BUILD_DEPS+= glib2-devel gperf kbd libacl-devel libuuid-devel \ + libusb-compat-devel pciutils pkg-config usbutils
define PKG_DESCRIPTION The udev package contains an implementation of devfs in userspace using \ diff --git a/pkgs/core/util-linux-ng/util-linux-ng.nm b/pkgs/core/util-linux-ng/util-linux-ng.nm index 85a6486..457b3e2 100644 --- a/pkgs/core/util-linux-ng/util-linux-ng.nm +++ b/pkgs/core/util-linux-ng/util-linux-ng.nm @@ -45,7 +45,69 @@ endef
PKG_TARBALL = $(THISAPP).tar.gz
-PKG_PACKAGES += $(PKG_NAME)-devel +PKG_PACKAGES += libblkid libblkid-devel libuuid libuuid-devel \ + libmount libmount-devel + +# Package information for libblkid +PKG_SUMMARY-libblkid = Block device ID library. +PKG_DESCRIPTION-libblkid = This is the block device identification library, \ + part of util-linux-ng. + +define PKG_FILES-libblkid + /lib/libblkid.* +endef + +# Package information for libblkid-devel +PKG_SUMMARY-libblkid-devel = Development library and header of libblkid. +PKG_DESCRIPTION-libblkid-devel = $(PKG_SUMMARY-libblkid-devel) + +define PKG_FILES-libblkid-devel + /usr/include/blkid/ \ + /usr/lib/libblkid.* \ + /usr/lib/pkgconfig/blkid.pc \ + /usr/share/man/man3/*blkid* +endef + +# Package information for libuuid +PKG_SUMMARY-libuuid = Universally unique ID library. +PKG_DESCRIPTION-libuuid = This is the universally unique ID library, \ + part of util-linux-ng. + +define PKG_FILES-libuuid + /lib/libuuid.* +endef + +# Package information for libuuid-devel +PKG_SUMMARY-libuuid-devel = Development library and header of libuuid. +PKG_DESCRIPTION-libuuid-devel = $(PKG_SUMMARY-libuuid-devel) + +define PKG_FILES-libuuid-devel + /usr/include/uuid/ \ + /usr/lib/libuuid.* \ + /usr/lib/pkgconfig/uuid.pc \ + /usr/share/man/man3/*uuid* +endef + +# Package information for libmount +PKG_SUMMARY-libmount = Device mounting library. +PKG_DESCRIPTION-libmount = This is the device mounting library, \ + part of util-linux-ng. + +define PKG_FILES-libmount + /lib/libmount.* +endef + +# Package information for libmount-devel +PKG_SUMMARY-libmount-devel = Development library and header of libmount. +PKG_DESCRIPTION-libmount-devel = $(PKG_SUMMARY-libmount-devel) + +define PKG_FILES-libmount-devel + /usr/include/mount/ \ + /usr/lib/libmount.* \ + /usr/lib/pkgconfig/mount.pc \ + /usr/share/man/man3/*mount* +endef +
CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
diff --git a/pkgs/core/xen/xen.nm b/pkgs/core/xen/xen.nm index f5bff8d..2848452 100644 --- a/pkgs/core/xen/xen.nm +++ b/pkgs/core/xen/xen.nm @@ -40,8 +40,8 @@ define PKG_DESCRIPTION feature set for virtualization. endef
-PKG_BUILD_DEPS+= gettext-devel openssl-devel python python-devel sdl-devel \ - util-linux-ng-devel xorg-x11-proto-devel zlib-devel +PKG_BUILD_DEPS+= gettext-devel libuuid-devel openssl-devel python python-devel \ + sdl-devel xorg-x11-proto-devel zlib-devel
PKG_TARBALL = $(THISAPP).tar.gz
diff --git a/pkgs/core/xfsprogs/xfsprogs.nm b/pkgs/core/xfsprogs/xfsprogs.nm index 0650784..5e6b08d 100644 --- a/pkgs/core/xfsprogs/xfsprogs.nm +++ b/pkgs/core/xfsprogs/xfsprogs.nm @@ -34,8 +34,8 @@ PKG_URL = http://oss.sgi.com/projects/xfs/ PKG_LICENSE = GPL+ and LGPLv2+ PKG_SUMMARY = Utilities for managing the XFS filesystem
-PKG_BUILD_DEPS+= libacl-devel e2fsprogs-devel libtool gettext readline-devel \ - util-linux-ng-devel +PKG_BUILD_DEPS+= e2fsprogs-devel gettext libacl-devel libblkid-devel libtool \ + libuuid-devel readline-devel
define PKG_DESCRIPTION A set of commands to use the XFS filesystem, including mkfs.xfs. diff --git a/pkgs/core/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm b/pkgs/core/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm index 795c5f0..80cc914 100644 --- a/pkgs/core/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm +++ b/pkgs/core/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = xorg-x11-xkb-utils PKG_VER = 7.4 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = Stefan Schantl stefan.schantl@ipfire.org PKG_GROUP = X/Fonts @@ -34,7 +34,8 @@ PKG_URL = http://www.x.org/ PKG_LICENSE = MIT PKG_SUMMARY = X.Org X11 xkb utilities.
-PKG_BUILD_DEPS+= bison libX11-devel libxkbfile-devel pkg-config +PKG_BUILD_DEPS+= bison libX11-devel libXaw-devel libXt-devel libxkbfile-devel \ + pkg-config
define PKG_DESCRIPTION X.Org X11 xkb utilities. @@ -43,7 +44,11 @@ endef CFLAGS += -DHAVE_STRCASECMP
SRC_PACKAGES = \ - xkbcomp-1.1.1 + xkbcomp-1.1.1 \ + xkbutils-1.0.3 \ + xkbevd-1.1.1 \ + xkbprint-1.0.1 \ + setxkbmap-1.2.0
PKG_OBJECTS += $(foreach package,$(SRC_PACKAGES),$(package).tar.bz2)
@@ -70,6 +75,10 @@ define MACRO_INSTALL
endef
-STAGE_INSTALL = $(foreach package,$(SRC_PACKAGES),$(call MACRO_INSTALL,$(package))) +define STAGE_INSTALL + $(foreach package,$(SRC_PACKAGES),$(call MACRO_INSTALL,$(package))) + + mv $(BUILDROOT)/usr/man* $(BUILDROOT)/usr/share/man +endef
hooks/post-receive -- IPFire 3.x development tree
-
git＠ipfire.org