Merge branch 'master' of ssh://git.opensde.net/srv/git/opensde/package-nopast

base/sysvinit/sysvinit-2.88dsf-remove-last-mesg.diff

@@ -0,0 +1,40 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: package/.../sysvinit/sysvinit-2.88dsf-remove-last-mesg.diff
+# Copyright (C) 2014 The OpenSDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+--- ./src/Makefile.orig	2014-01-24 13:37:31.226403034 +0100
++++ ./src/Makefile	2014-01-24 13:50:47.760823361 +0100
+@@ -16,9 +16,9 @@
+ # For some known distributions we do not build all programs, otherwise we do.
+ BIN	=
+ SBIN	= init halt shutdown runlevel killall5 fstab-decode
+-USRBIN	= last mesg
++USRBIN	=
+ 
+-MAN1	= last.1 lastb.1 mesg.1
++MAN1	=
+ MAN5	= initscript.5 inittab.5
+ MAN8	= halt.8 init.8 killall5.8 pidof.8 poweroff.8 reboot.8 runlevel.8
+ MAN8	+= shutdown.8 telinit.8 fstab-decode.8
+@@ -155,9 +155,6 @@
+ 		ln -sf halt $(ROOT)/sbin/poweroff
+ 		ln -sf init $(ROOT)/sbin/telinit
+ 		ln -sf /sbin/killall5 $(ROOT)/bin/pidof
+-		if [ ! -f $(ROOT)/usr/bin/lastb ]; then \
+-			ln -sf last $(ROOT)/usr/bin/lastb; \
+-		fi
+ 		$(INSTALL_DIR) $(ROOT)/usr/include/
+ 		$(INSTALL_DATA) initreq.h $(ROOT)/usr/include/
+ 		$(INSTALL_DIR) $(ROOT)$(MANDIR)/man1/

base/sysvinit/sysvinit.conf

@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../sysvinit/sysvinit.conf
-# Copyright (C) 2008 - 2012 The OpenSDE Project
+# Copyright (C) 2008 - 2014 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2003 Clifford Wolf
 #
@@ -34,4 +34,7 @@ if pkginstalled util-linux; then
 		sed -i -e '/utmpdump/d' Makefile
 	}
 	hook_add premake 9 'disable_progs'
+
+	# modern util-linux provides replacements for last(1), lastb(1) and mesg(1)
+	var_append patchfiles ' ' "$confdir/sysvinit-$ver-remove-last-mesg.diff"
 fi

base/util-linux/0002-cfdisk-add-tinfo-libs.patch

@@ -0,0 +1,37 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: package/.../util-linux/0002-cfdisk-add-tinfo-libs.patch
+# Copyright (C) 2014 The OpenSDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+In the case libtinfo was build and installed as a separate library
+cfdisk needs to be linked against it.
+
+build error
+----------------------------------------------------------------------
+i686-unknown-linux-gnu/bin/ld: fdisks/cfdisk-cfdisk.o: undefined reference to symbol 'keypad'
+/build/morfoh/opensde/master-musl/build/min2-master-generic-x86-pentium2/lib/libtinfow.so.5: error adding symbols: DSO missing from command line
+collect2: error: ld returned 1 exit status
+----------------------------------------------------------------------
+
+--- ./fdisks/Makemodule.am.orig	2014-01-24 15:53:13.610905311 +0100
++++ ./fdisks/Makemodule.am	2014-01-24 15:53:47.043670665 +0100
+@@ -68,7 +68,7 @@
+ cfdisk_LDADD += -lslang
+ else
+ cfdisk_CFLAGS += $(NCURSES_CFLAGS)
+-cfdisk_LDADD += $(NCURSES_LIBS)
++cfdisk_LDADD += $(NCURSES_LIBS) $(TINFO_LIBS)
+ endif
+ endif # BUILD_CFDISK
+