create core package section, cleanup old installer stuff

13 files changed, 31 insertions, 194 deletions

diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index 636b43f48..4a2a48d30 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -4,47 +4,54 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		util-linux
-PKG_VERSION:=		2.23.2
-PKG_RELEASE:=		6
-PKG_MD5SUM:=		b39fde897334a4858bb2098edcce5b3f
-PKG_DESCR:=		Linux utilities (meta-package)
-PKG_SECTION:=		utils
-PKG_DEPENDS:=		mount fdisk sfdisk swap-utils losetup mount mcookie
+PKG_VERSION:=		2.24.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		3f191727a0d28f7204b755cf1b6ea0aa
+PKG_DESCR:=		basic Linux utilities (also provided by busybox)
+PKG_SECTION:=		core
 PKG_BUILDDEP:=		ncurses
-PKG_SITES:=		http://www.kernel.org/pub/linux/utils/util-linux/v2.23/
+PKG_SITES:=		http://www.kernel.org/pub/linux/utils/util-linux/v2.24/
 PKG_NOPARALLEL:=	1
 PKG_OPTS:=		dev
+PKG_MULTI:=		1
 
 PKG_ARCH_DEPENDS:=	!m68k
 
 PKG_SUBPKGS:=		UTIL_LINUX FDISK SFDISK SWAP_UTILS LOSETUP MCOOKIE MOUNT
-PKG_SUBPKGS+=		LIBUUID LIBBLKID LIBMOUNT
-PKGSD_LIBUUID:=		UUID library
+PKG_SUBPKGS+=		LIBUUID LIBBLKID LIBMOUNT SU CFDISK
+PKGSD_LIBUUID:=		uuid library
 PKGSC_LIBUUID:=		libs
-PKGSD_LIBBLKID:=	BLKID library
+PKGSD_LIBBLKID:=	blkid library
 PKGSC_LIBBLKID:=	libs
-PKGSD_LIBMOUNT:=	Mount library
+PKGSD_LIBMOUNT:=	mount library
 PKGSC_LIBMOUNT:=	libs
-PKGSD_FDISK:=		Partition table manipulation utility
-PKGSC_FDISK:=		fs
-PKGSD_SFDISK:=		Scriptable Partition table manipulation utility
+PKGSD_FDISK:=		partition table manipulation utility
+PKGSC_FDISK:=		core
+PKGSD_SFDISK:=		scriptable partition table manipulation utility
 PKGSC_SFDISK:=		fs
-PKGSD_SWAP_UTILS:=	Swap space management utilities
+PKGSD_CFDISK:=		partition table manipulation utility
+PKGSC_CFDISK:=		fs
+PKGSD_SU:=		switch user utility
+PKGSB_SU:=		pam
+PKGSC_SU:=		core
+PKGSD_SWAP_UTILS:=	swap space management utilities
 PKGSS_SWAP_UTILS:=	libblkid
-PKGSC_SWAP_UTILS:=	fs
-PKGSD_LOSETUP:=		Loop devices management utilities
+PKGSC_SWAP_UTILS:=	core
+PKGSD_LOSETUP:=		loop devices management utilities
 PKGSS_LOSETUP:=		kmod-blk-dev-loop
 PKGSD_MOUNT:=		mount/umount utilities
 PKGSS_MOUNT:=		libblkid libmount libuuid
-PKGSC_MOUNT:=		fs
-PKGSD_MCOOKIE:=		Generate magic cookies for xauth
+PKGSC_MOUNT:=		core
+PKGSD_MCOOKIE:=		generate magic cookies for xauth
 PKGSC_MCOOKIE:=		x11/apps
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,UTIL_LINUX,util-linux,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,FDISK,fdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FDISK},${PKGSC_FDISK}))
+$(eval $(call PKG_template,CFDISK,cfdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_CFDISK},${PKGSC_CFDISK}))
 $(eval $(call PKG_template,SFDISK,sfdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_SFDISK},${PKGSC_SFDISK}))
+$(eval $(call PKG_template,SU,su,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_SU},${PKGSD_SU},${PKGSC_SU}))
 $(eval $(call PKG_template,SWAP_UTILS,swap-utils,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_SWAP_UTILS},${PKGSD_SWAP_UTILS},${PKGSC_SWAP_UTILS}))
 $(eval $(call PKG_template,LOSETUP,losetup,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LOSETUP},${PKGSD_LOSETUP},${PKG_SECTION}))
 $(eval $(call PKG_template,MOUNT,mount,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_MOUNT},${PKGSD_MOUNT},${PKGSC_MOUNT}))
@@ -59,7 +66,7 @@ CONFIGURE_ARGS+=	--disable-use-tty-group \
 			--disable-schedutils \
 			--disable-cramfs \
 			--disable-login \
-			--disable-su \
+			--enable-su \
 			--enable-libuuid \
 			--enable-libblkid \
 			--enable-libmount \
@@ -69,12 +76,14 @@ CONFIGURE_ARGS+=	--disable-use-tty-group \
 FAKE_FLAGS+=		INSTALLSUID="install -m 4755"
 TARGET_CFLAGS+=		-DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK -ltinfo
 
-util-linux-install:
-
 fdisk-install:
 	${INSTALL_DIR} ${IDIR_FDISK}/usr/sbin
 	${CP} ${WRKINST}/sbin/fdisk ${IDIR_FDISK}/usr/sbin
 
+cfdisk-install:
+	${INSTALL_DIR} ${IDIR_CFDISK}/usr/sbin
+	${CP} ${WRKINST}/sbin/cfdisk ${IDIR_FDISK}/usr/sbin
+
 sfdisk-install:
 	${INSTALL_DIR} ${IDIR_SFDISK}/usr/sbin
 	${CP} ${WRKINST}/sbin/sfdisk ${IDIR_SFDISK}/usr/sbin
diff --git a/package/util-linux/patches/patch-fdisks_cfdisk_c b/package/util-linux/patches/patch-fdisks_cfdisk_c
deleted file mode 100644
index c7595e3cc..000000000
--- a/package/util-linux/patches/patch-fdisks_cfdisk_c
+++ /dev/null
@@ -1,13 +0,0 @@
-patch taken from sabotage linux -- https://github.com/rofl0r/sabotage
-
---- util-linux-2.23.2.orig/fdisks/cfdisk.c	2013-07-30 10:39:26.000000000 +0200
-+++ util-linux-2.23.2/fdisks/cfdisk.c	2013-08-14 12:42:25.000000000 +0200
-@@ -325,7 +325,7 @@ int num_parts = 0;
- int logical = 0;
- long long logical_sectors[MAXIMUM_PARTS];
- 
--__sighandler_t old_SIGINT, old_SIGTERM;
-+sighandler_t old_SIGINT, old_SIGTERM;
- 
- int arrow_cursor = FALSE;
- int display_units = MEGABYTES;
diff --git a/package/util-linux/patches/patch-fdisks_fdisksunlabel_c b/package/util-linux/patches/patch-fdisks_fdisksunlabel_c
deleted file mode 100644
index 35851b9b6..000000000
--- a/package/util-linux/patches/patch-fdisks_fdisksunlabel_c
+++ /dev/null
@@ -1,30 +0,0 @@
-patch taken from sabotage linux -- https://github.com/rofl0r/sabotage
-
---- util-linux-2.23.2.orig/fdisks/fdisksunlabel.c	2013-07-30 10:39:26.000000000 +0200
-+++ util-linux-2.23.2/fdisks/fdisksunlabel.c	2013-08-14 12:38:12.000000000 +0200
-@@ -383,9 +383,11 @@ static void fetch_sun(struct fdisk_conte
- 	}
- }
- 
--static int verify_sun_cmp(int *a, int *b, void *data)
-+static void* cmp_data;
-+static int verify_sun_cmp(const void *pa, const void *pb)
- {
--    unsigned int *verify_sun_starts = (unsigned int *) data;
-+    const int *a = pa, *b = pb;
-+    unsigned int *verify_sun_starts = (unsigned int *) cmp_data;	
- 
-     if (*a == -1)
- 	    return 1;
-@@ -449,9 +451,8 @@ static int sun_verify_disklabel(struct f
-         else
-             array[i] = -1;
-     }
--    qsort_r(array,ARRAY_SIZE(array),sizeof(array[0]),
--	  (int (*)(const void *,const void *,void *)) verify_sun_cmp,
--	  verify_sun_starts);
-+    cmp_data = verify_sun_starts;
-+    qsort(array,ARRAY_SIZE(array),sizeof(array[0]), verify_sun_cmp);
- 
-     if (array[0] == -1) {
- 	fdisk_info(cxt, _("No partitions defined"));
diff --git a/package/util-linux/patches/patch-include_ttyutils_h b/package/util-linux/patches/patch-include_ttyutils_h
deleted file mode 100644
index 2fd1baed0..000000000
--- a/package/util-linux/patches/patch-include_ttyutils_h
+++ /dev/null
@@ -1,12 +0,0 @@
-patch taken from sabotage linux -- https://github.com/rofl0r/sabotage
-
---- util-linux-2.23.2.orig/include/ttyutils.h	2013-07-15 10:25:46.000000000 +0200
-+++ util-linux-2.23.2/include/ttyutils.h	2013-08-14 12:31:25.000000000 +0200
-@@ -10,6 +10,7 @@
- #include <stdlib.h>
- #include <termios.h>
- #include <limits.h>
-+#include <sys/ttydefaults.h>
- #ifdef HAVE_SYS_IOCTL_H
- #include <sys/ioctl.h>
- #endif
diff --git a/package/util-linux/patches/patch-lib_fileutils_c b/package/util-linux/patches/patch-lib_fileutils_c
deleted file mode 100644
index d4edf1c6a..000000000
--- a/package/util-linux/patches/patch-lib_fileutils_c
+++ /dev/null
@@ -1,14 +0,0 @@
---- util-linux-2.23.2.orig/lib/fileutils.c	2013-06-13 09:46:10.000000000 +0200
-+++ util-linux-2.23.2/lib/fileutils.c	2013-08-14 11:58:47.000000000 +0200
-@@ -37,7 +37,11 @@ int xmkstemp(char **tmpname, char *dir)
- 		xasprintf(&localtmp, "%s/%s.XXXXXX", _PATH_TMP,
- 			  program_invocation_short_name);
- 	old_mode = umask(077);
-+#if defined(__GLIBC__) && !defined(__UCLIBC__)
- 	fd = mkostemp(localtmp, O_RDWR|O_CREAT|O_EXCL|O_CLOEXEC);
-+#else
-+	fd = mkstemp(localtmp);
-+#endif
- 	umask(old_mode);
- 	if (fd == -1) {
- 		free(localtmp);
diff --git a/package/util-linux/patches/patch-libblkid_blkid_pc_in b/package/util-linux/patches/patch-libblkid_blkid_pc_in
deleted file mode 100644
index 475bc2f92..000000000
--- a/package/util-linux/patches/patch-libblkid_blkid_pc_in
+++ /dev/null
@@ -1,12 +0,0 @@
---- util-linux-2.23.2.orig/libblkid/blkid.pc.in	2013-02-27 17:46:29.000000000 +0100
-+++ util-linux-2.23.2/libblkid/blkid.pc.in	2013-10-28 12:08:14.000000000 +0100
-@@ -1,7 +1,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@usrlib_execdir@
--includedir=@includedir@
-+libdir=${prefix}/lib
-+includedir=${prefix}/include
- 
- Name: blkid
- Description: Block device id library
diff --git a/package/util-linux/patches/patch-libblkid_src_save_c b/package/util-linux/patches/patch-libblkid_src_save_c
deleted file mode 100644
index c25f42c10..000000000
--- a/package/util-linux/patches/patch-libblkid_src_save_c
+++ /dev/null
@@ -1,14 +0,0 @@
---- util-linux-2.23.2.orig/libblkid/src/save.c	2013-07-30 10:39:26.000000000 +0200
-+++ util-linux-2.23.2/libblkid/src/save.c	2013-08-14 11:59:06.000000000 +0200
-@@ -110,7 +110,11 @@ int blkid_flush_cache(blkid_cache cache)
- 		tmp = malloc(strlen(filename) + 8);
- 		if (tmp) {
- 			sprintf(tmp, "%s-XXXXXX", filename);
-+#if defined(__GLIBC__) && !defined(__UCLIBC__)
- 			fd = mkostemp(tmp, O_RDWR|O_CREAT|O_EXCL|O_CLOEXEC);
-+#else
-+			fd = mkstemp(tmp);
-+#endif
- 			if (fd >= 0) {
- 				if (fchmod(fd, 0644) != 0)
- 					DBG(SAVE, blkid_debug("%s: fchmod failed", filename));
diff --git a/package/util-linux/patches/patch-libmount_src_utils_c b/package/util-linux/patches/patch-libmount_src_utils_c
deleted file mode 100644
index b0fcc2afa..000000000
--- a/package/util-linux/patches/patch-libmount_src_utils_c
+++ /dev/null
@@ -1,14 +0,0 @@
---- util-linux-2.23.2.orig/libmount/src/utils.c	2013-07-30 11:15:27.000000000 +0200
-+++ util-linux-2.23.2/libmount/src/utils.c	2013-08-14 11:58:25.000000000 +0200
-@@ -842,7 +842,11 @@ int mnt_open_uniq_filename(const char *f
- 	 */
- 	oldmode = umask(S_IRGRP|S_IWGRP|S_IXGRP|
- 			S_IROTH|S_IWOTH|S_IXOTH);
-+#if defined(__GLIBC__) && !defined(__UCLIBC__)
- 	fd = mkostemp(n, O_RDWR|O_CREAT|O_EXCL|O_CLOEXEC);
-+#else
-+	fd = mkstemp(n);
-+#endif
- 	umask(oldmode);
- 
- 	if (fd >= 0 && name)
diff --git a/package/util-linux/patches/patch-libuuid_uuid_pc_in b/package/util-linux/patches/patch-libuuid_uuid_pc_in
deleted file mode 100644
index 059310086..000000000
--- a/package/util-linux/patches/patch-libuuid_uuid_pc_in
+++ /dev/null
@@ -1,13 +0,0 @@
---- util-linux-2.23.2.orig/libuuid/uuid.pc.in	2013-02-27 17:46:29.883020734 +0100
-+++ util-linux-2.23.2/libuuid/uuid.pc.in	2013-12-17 17:07:37.935403478 +0100
-@@ -1,7 +1,7 @@
- prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@usrlib_execdir@
--includedir=@includedir@
-+exec_prefix=${prefix}
-+libdir=${prefix}/lib
-+includedir=${prefix}/include
- 
- Name: uuid
- Description: Universally unique id library
diff --git a/package/util-linux/patches/patch-term-utils_setterm_c b/package/util-linux/patches/patch-term-utils_setterm_c
deleted file mode 100644
index bd84e5bbb..000000000
--- a/package/util-linux/patches/patch-term-utils_setterm_c
+++ /dev/null
@@ -1,13 +0,0 @@
-patch taken from sabotage linux -- https://github.com/rofl0r/sabotage
-
---- util-linux-2.23.2.orig/term-utils/setterm.c	2013-06-13 09:46:10.000000000 +0200
-+++ util-linux-2.23.2/term-utils/setterm.c	2013-08-14 12:47:43.000000000 +0200
-@@ -123,7 +123,7 @@
- #include "nls.h"
- #include "closestream.h"
- 
--#if __GNU_LIBRARY__ < 5
-+#if defined(__GNU_LIBRARY__) && __GNU_LIBRARY__ < 5
- #ifndef __alpha__
- # include <linux/unistd.h>
- #define __NR_klogctl __NR_syslog
diff --git a/package/util-linux/patches/patch-term-utils_ttymsg_c b/package/util-linux/patches/patch-term-utils_ttymsg_c
deleted file mode 100644
index a93f16d4e..000000000
--- a/package/util-linux/patches/patch-term-utils_ttymsg_c
+++ /dev/null
@@ -1,12 +0,0 @@
-patch taken from sabotage linux -- https://github.com/rofl0r/sabotage
-
---- util-linux-2.23.2.orig/term-utils/ttymsg.c	2013-07-30 10:39:26.000000000 +0200
-+++ util-linux-2.23.2/term-utils/ttymsg.c	2013-08-14 12:50:50.000000000 +0200
-@@ -41,6 +41,7 @@
-   */
- 
- #include <sys/types.h>
-+#include <sys/param.h>
- #include <sys/uio.h>
- #include <signal.h>
- #include <fcntl.h>
diff --git a/package/util-linux/patches/patch-text-utils_hexdump_h b/package/util-linux/patches/patch-text-utils_hexdump_h
deleted file mode 100644
index 79e53a00d..000000000
--- a/package/util-linux/patches/patch-text-utils_hexdump_h
+++ /dev/null
@@ -1,12 +0,0 @@
-patch taken from sabotage linux -- https://github.com/rofl0r/sabotage
-
---- util-linux-2.23.2.orig/text-utils/hexdump.h	2013-07-30 10:39:26.000000000 +0200
-+++ util-linux-2.23.2/text-utils/hexdump.h	2013-08-14 12:44:31.000000000 +0200
-@@ -33,6 +33,7 @@
-  *	@(#)hexdump.h	5.4 (Berkeley) 6/1/90
-  */
- 
-+#include <sys/types.h>
- typedef struct _pr {
- 	struct _pr *nextpr;		/* next print unit */
- #define	F_ADDRESS	0x001		/* print offset */
diff --git a/package/util-linux/patches/patch-text-utils_pg_c b/package/util-linux/patches/patch-text-utils_pg_c
deleted file mode 100644
index daa6adaee..000000000
--- a/package/util-linux/patches/patch-text-utils_pg_c
+++ /dev/null
@@ -1,13 +0,0 @@
-patch taken from sabotage linux -- https://github.com/rofl0r/sabotage
-
---- util-linux-2.23.2.orig/text-utils/pg.c	2013-07-30 10:39:26.000000000 +0200
-+++ util-linux-2.23.2/text-utils/pg.c	2013-08-14 12:44:55.000000000 +0200
-@@ -37,7 +37,7 @@
- #ifndef	TIOCGWINSZ
- # include <sys/ioctl.h>
- #endif
--#include <sys/termios.h>
-+#include <termios.h>
- #include <fcntl.h>
- #include <regex.h>
- #include <stdio.h>