sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (7c20aa9bf687a8cfc42830fd47c71561d7d9eecc)
- From: Vlad Glagolev <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (7c20aa9bf687a8cfc42830fd47c71561d7d9eecc)
- Date: Wed, 30 Jul 2008 14:50:04 -0500
GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:
smgl/simpleinit-msb/BUILD | 8 +++++---
smgl/simpleinit-msb/CONFIGURE | 5 ++---
smgl/simpleinit-msb/DEPENDS | 4 ++--
smgl/simpleinit-msb/DETAILS | 13 ++++++-------
smgl/simpleinit-msb/HISTORY | 9 ++++++++-
smgl/simpleinit-msb/INSTALL | 18 ++++++++----------
smgl/simpleinit-msb/PRE_BUILD | 23 ++++++++++++-----------
smgl/simpleinit-msb/shutdown.nonls.diff | 12 ------------
smgl/simpleinit-msb/simpleinit-msb-crypt.diff | 21 ---------------------
smgl/simpleinit-msb/simpleinit-msb-crypt.patch | 20 ++++++++++++++++++++
smgl/simpleinit-msb/simpleinit-nonls.patch | 25
+++++++++++++++++++++++++
smgl/simpleinit-msb/simpleinit-selinux.patch | 4 ++--
smgl/simpleinit-msb/simpleinit.nonls.diff | 13 -------------
smgl/simpleinit-msb/simpleinit.patch | 15 ++++++---------
14 files changed, 96 insertions(+), 94 deletions(-)
New commits:
commit 7c20aa9bf687a8cfc42830fd47c71561d7d9eecc
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
simpleinit-msb: => 1.3 + fixes
diff --git a/smgl/simpleinit-msb/BUILD b/smgl/simpleinit-msb/BUILD
index f69e31d..0644cc5 100755
--- a/smgl/simpleinit-msb/BUILD
+++ b/smgl/simpleinit-msb/BUILD
@@ -1,3 +1,5 @@
-./configure &&
-sedit 'd/#define HAVE_locale_h/' defines.h
-make OPT="$CFLAGS"
+./configure &&
+
+sed -i "/#define HAVE_locale_h/ d" defines.h &&
+
+make OPT="$CFLAGS"
diff --git a/smgl/simpleinit-msb/CONFIGURE b/smgl/simpleinit-msb/CONFIGURE
index 47207a2..e5a32fa 100755
--- a/smgl/simpleinit-msb/CONFIGURE
+++ b/smgl/simpleinit-msb/CONFIGURE
@@ -1,4 +1,3 @@
-config_query SIMPLEINIT_STATIC \
- "Build a static init?" \
+config_query SIMPLEINIT_STATIC \
+ "Build a static init?" \
n
-
diff --git a/smgl/simpleinit-msb/DEPENDS b/smgl/simpleinit-msb/DEPENDS
index 18594eb..c4b4f1a 100755
--- a/smgl/simpleinit-msb/DEPENDS
+++ b/smgl/simpleinit-msb/DEPENDS
@@ -1,2 +1,2 @@
-depends gnupg &&
-depends smgl-fhs
+depends gnupg &&
+depends smgl-fhs
diff --git a/smgl/simpleinit-msb/DETAILS b/smgl/simpleinit-msb/DETAILS
index 892dd00..fc1a524 100755
--- a/smgl/simpleinit-msb/DETAILS
+++ b/smgl/simpleinit-msb/DETAILS
@@ -1,17 +1,16 @@
SPELL=simpleinit-msb
- VERSION=1.2
+ VERSION=1.3
SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.winterdrache.de/linux/newboot/$SOURCE
-
SOURCE_HASH=sha512:e31b517d7da11c91b93d03808b5bec663973e4b4ea07b2451dcb9ccb6034eca8e79e1226ff62d527421070123d339106db354220e2c7a0393cd9c99d2a4e62e0
+
SOURCE_HASH=sha512:62b32450112e1ef99efbd784931ee0abc4d2a3d4a410adc0d657fde9f14a848a000d185298f35a7fa43367d003ab6ee264d42d3bad1250e2caceb5fe8fa33f03
WEB_SITE=http://www.winterdrache.de/linux/newboot/
ENTERED=20030505
- PATCHLEVEL=2
LICENSE[0]=GPL
KEYWORDS="smgl"
- SHORT="Replacement for SysVinit"
+ SHORT="replacement for SysVinit"
cat << EOF
Simpleinit-MSB is a replacement for the SysVinit. It provides a simple way of
-defining dependancies between initscripts.
-This spell also installs some useful utilities from sysvinit.
+defining dependancies between initscripts. This spell also installs some
useful
+utilities from sysvinit.
EOF
diff --git a/smgl/simpleinit-msb/HISTORY b/smgl/simpleinit-msb/HISTORY
index d5593dc..31eb6a3 100644
--- a/smgl/simpleinit-msb/HISTORY
+++ b/smgl/simpleinit-msb/HISTORY
@@ -1,3 +1,11 @@
+2008-07-30 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.3, quoting the paths!
+ * BUILD: added missing `&&', cleaned up
+ * CONFIGURE, DEPENDS: cleaned up
+ * INSTALL: made dir installation compact
+ * PRE_BUILD: fixed some patches for 1.3, cleaned up, SPELL > SCRIPT,
+ merged nonls patches, quoting the paths!
+
2007-09-14 David Brown <dmlb2000 AT gmail.com>
* PRE_BUILD: added selinux patch for loading policies
* simpleinit-selinux.patch: added
@@ -104,4 +112,3 @@
2003-05-05 Robert Helgesson <rycee AT home.se>
* created spell
-
diff --git a/smgl/simpleinit-msb/INSTALL b/smgl/simpleinit-msb/INSTALL
index eb8416e..675e169 100755
--- a/smgl/simpleinit-msb/INSTALL
+++ b/smgl/simpleinit-msb/INSTALL
@@ -1,11 +1,9 @@
-# yes their makefile assumes these exist
-mkdir -p $INSTALL_ROOT/sbin
-mkdir -p $INSTALL_ROOT/usr/share/man/man1
-mkdir -p $INSTALL_ROOT/usr/share/man/man5
-mkdir -p $INSTALL_ROOT/usr/share/man/man8
-make DESTDIR=${INSTALL_ROOT} \
- ROOT=${INSTALL_ROOT} \
- install &&
+install -vm 755 -d $INSTALL_ROOT/sbin \
+ $INSTALL_ROOT/usr/share/man/man{1,5,8} &&
-cp $SCRIPT_DIRECTORY/telinit \
- ${INSTALL_ROOT}/sbin/telinit
+make DESTDIR="$INSTALL_ROOT" \
+ ROOT="$INSTALL_ROOT" \
+ install &&
+
+install "$SPELL_DIRECTORY/telinit" \
+ "$INSTALL_ROOT/sbin/telinit"
diff --git a/smgl/simpleinit-msb/PRE_BUILD b/smgl/simpleinit-msb/PRE_BUILD
index 2a22375..f3e873d 100755
--- a/smgl/simpleinit-msb/PRE_BUILD
+++ b/smgl/simpleinit-msb/PRE_BUILD
@@ -1,13 +1,14 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/simpleinit.patch &&
-patch -p0 < $SCRIPT_DIRECTORY/simpleinit-1000uid.patch &&
-patch -p1 < $SCRIPT_DIRECTORY/simpleinit-msb-crypt.diff &&
-patch -p0 < $SPELL_DIRECTORY/simpleinit.nonls.diff &&
-patch -p0 < $SPELL_DIRECTORY/shutdown.nonls.diff &&
-patch -p0 < $SPELL_DIRECTORY/simpleinit-output-on-shutdown.patch &&
-patch -p1 < $SPELL_DIRECTORY/simpleinit-selinux.patch &&
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/simpleinit.patch" &&
+patch -p0 < "$SPELL_DIRECTORY/simpleinit-1000uid.patch" &&
+patch -p0 < "$SPELL_DIRECTORY/simpleinit-msb-crypt.patch" &&
+patch -p0 < "$SPELL_DIRECTORY/simpleinit-output-on-shutdown.patch" &&
+patch -p0 < "$SPELL_DIRECTORY/simpleinit-selinux.patch" &&
+patch -p0 < "$SPELL_DIRECTORY/simpleinit-nonls.patch" &&
+
if [[ $SIMPLEINIT_STATIC == y ]]; then
-sedit 's#shutdown: shutdown.o $(LIB)/my_reboot.o $(LIB)/xstrncpy.o#shutdown:
shutdown.o $(LIB)/my_reboot.o $(LIB)/xstrncpy.o\n\t$(CC) $(LDFLAGS) -o $@
$^#' login-utils/Makefile &&
-sedit 's:$(CC) $(LDFLAGS):$(CC) -static $(LDFLAGS):g' login-utils/Makefile
+ sed -i "s#shutdown: shutdown.o $(LIB)/my_reboot.o
$(LIB)/xstrncpy.o#shutdown: shutdown.o $(LIB)/my_reboot.o
$(LIB)/xstrncpy.o\n\t$(CC) $(LDFLAGS) -o $@ $^#;s:$(CC) $(LDFLAGS):$(CC)
-static $(LDFLAGS):g" \
+ login-utils/Makefile
fi
diff --git a/smgl/simpleinit-msb/shutdown.nonls.diff
b/smgl/simpleinit-msb/shutdown.nonls.diff
deleted file mode 100644
index 8d767aa..0000000
--- a/smgl/simpleinit-msb/shutdown.nonls.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- login-utils/shutdown.c.orig 2006-11-19 15:43:36.000000000 +0100
-+++ login-utils/shutdown.c 2006-11-19 15:44:43.000000000 +0100
-@@ -197,9 +197,6 @@
- }
- sigsetmask (0); /* simpleinit(8) blocks all signals: undo for ALRM
*/
- for (i = 1; i < NSIG; i++) signal (i, SIG_DFL); /* unnecessary */
-- setlocale(LC_ALL, "");
-- bindtextdomain(PACKAGE, LOCALEDIR);
-- textdomain(PACKAGE);
-
- #ifndef DEBUGGING
- if(setreuid (0, 0)) {
diff --git a/smgl/simpleinit-msb/simpleinit-msb-crypt.diff
b/smgl/simpleinit-msb/simpleinit-msb-crypt.diff
deleted file mode 100644
index 27b3cfd..0000000
--- a/smgl/simpleinit-msb/simpleinit-msb-crypt.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urN simpleinit-msb-1.2/sysvtools/Makefile
simpleinit-msb-1.2-new/sysvtools/Makefile
---- simpleinit-msb-1.2/sysvtools/Makefile 2001-09-26 13:01:08.000000000
+0200
-+++ simpleinit-msb-1.2-new/sysvtools/Makefile 2005-04-15 00:43:31.281944078
+0200
-@@ -8,6 +8,8 @@
- # Version: @(#)Makefile 2.78 13-Nov-1999 miquels AT cistron.nl
- #
-
-+include ../make_include
-+
- CC = cc
- CFLAGS = -Wall -O2 -D_GNU_SOURCE
- LDFLAGS = -s
-@@ -22,7 +24,7 @@
- MANDIR = /usr/share/man
-
- # Additional libs for Gnu Libc
--ifneq ($(wildcard /usr/lib/libcrypt.a),)
-+ifeq "$(NEED_LIBCRYPT)" "yes"
- LCRYPT = -lcrypt
- endif
-
diff --git a/smgl/simpleinit-msb/simpleinit-msb-crypt.patch
b/smgl/simpleinit-msb/simpleinit-msb-crypt.patch
new file mode 100644
index 0000000..ba40d7e
--- /dev/null
+++ b/smgl/simpleinit-msb/simpleinit-msb-crypt.patch
@@ -0,0 +1,20 @@
+--- sysvtools/Makefile.orig 2007-11-09 00:16:54.000000000 +0300
++++ sysvtools/Makefile 2008-07-30 23:00:07.328860627 +0400
+@@ -8,6 +8,8 @@
+ # Version: @(#)Makefile 2.85-13 23-Mar-2004 miquels AT cistron.nl
+ #
+
++include ../make_include
++
+ CC = gcc
+ CFLAGS = -Wall -O2 -fomit-frame-pointer -D_GNU_SOURCE
+ LDFLAGS = -s
+@@ -36,7 +38,7 @@
+ MANDIR = /usr/share/man
+
+ # Additional libs for GNU libc.
+-ifneq ($(wildcard /usr/lib/libcrypt.a),)
++ifeq "$(NEED_LIBCRYPT)" "yes"
+ LCRYPT = -lcrypt
+ endif
+
diff --git a/smgl/simpleinit-msb/simpleinit-nonls.patch
b/smgl/simpleinit-msb/simpleinit-nonls.patch
new file mode 100644
index 0000000..1a40bfd
--- /dev/null
+++ b/smgl/simpleinit-msb/simpleinit-nonls.patch
@@ -0,0 +1,25 @@
+--- login-utils/simpleinit.c.orig 2006-11-19 15:42:20.000000000 +0100
++++ login-utils/simpleinit.c 2006-11-19 15:43:16.000000000 +0100
+@@ -408,10 +407,6 @@
+ my_reboot (LINUX_REBOOT_CMD_CAD_OFF);
+ }
+
+- setlocale(LC_ALL, "");
+- bindtextdomain(PACKAGE, LOCALEDIR);
+- textdomain(PACKAGE);
+-
+ /* Find script to run. Command-line overrides config file overrides
+ built-in default */
+ for (i = 0; i < NUMCMD; i++) inittab[i].pid = -1;
+--- login-utils/shutdown.c.orig 2006-11-19 15:43:36.000000000 +0100
++++ login-utils/shutdown.c 2006-11-19 15:44:43.000000000 +0100
+@@ -197,9 +197,6 @@
+ }
+ sigsetmask (0); /* simpleinit(8) blocks all signals: undo for ALRM
*/
+ for (i = 1; i < NSIG; i++) signal (i, SIG_DFL); /* unnecessary */
+- setlocale(LC_ALL, "");
+- bindtextdomain(PACKAGE, LOCALEDIR);
+- textdomain(PACKAGE);
+
+ #ifndef DEBUGGING
+ if(setreuid (0, 0)) {
diff --git a/smgl/simpleinit-msb/simpleinit-selinux.patch
b/smgl/simpleinit-msb/simpleinit-selinux.patch
index 09f5194..a495647 100644
--- a/smgl/simpleinit-msb/simpleinit-selinux.patch
+++ b/smgl/simpleinit-msb/simpleinit-selinux.patch
@@ -1,5 +1,5 @@
---- a/login-utils/simpleinit.c 2007-09-14 23:44:34.726342737 +0000
-+++ b/login-utils/simpleinit.c 2007-09-14 23:44:18.000000000 +0000
+--- login-utils/simpleinit.c 2007-09-14 23:44:34.726342737 +0000
++++ login-utils/simpleinit.c 2007-09-14 23:44:18.000000000 +0000
@@ -218,6 +218,8 @@
#include <sys/ioctl.h>
#include <dirent.h>
diff --git a/smgl/simpleinit-msb/simpleinit.nonls.diff
b/smgl/simpleinit-msb/simpleinit.nonls.diff
deleted file mode 100644
index 598c76c..0000000
--- a/smgl/simpleinit-msb/simpleinit.nonls.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- login-utils/simpleinit.c.orig 2006-11-19 15:42:20.000000000 +0100
-+++ login-utils/simpleinit.c 2006-11-19 15:43:16.000000000 +0100
-@@ -408,10 +407,6 @@
- my_reboot (LINUX_REBOOT_CMD_CAD_OFF);
- }
-
-- setlocale(LC_ALL, "");
-- bindtextdomain(PACKAGE, LOCALEDIR);
-- textdomain(PACKAGE);
--
- /* Find script to run. Command-line overrides config file overrides
- built-in default */
- for (i = 0; i < NUMCMD; i++) inittab[i].pid = -1;
diff --git a/smgl/simpleinit-msb/simpleinit.patch
b/smgl/simpleinit-msb/simpleinit.patch
index fc15f17..f853a23 100644
--- a/smgl/simpleinit-msb/simpleinit.patch
+++ b/smgl/simpleinit-msb/simpleinit.patch
@@ -1,6 +1,5 @@
-diff -Nur simpleinit-msb-1.2/lib/pathnames.h
simpleinit-msb-1.2-smgl/lib/pathnames.h
---- simpleinit-msb-1.2/lib/pathnames.h 2001-09-26 12:59:46.000000000 +0200
-+++ simpleinit-msb-1.2-smgl/lib/pathnames.h 2004-02-20 14:33:35.000000000
+0100
+--- lib/pathnames.h.orig 2001-09-26 12:59:46.000000000 +0200
++++ lib/pathnames.h 2004-02-20 14:33:35.000000000 +0100
@@ -130,7 +130,7 @@
#define _PATH_MTAB "/etc/mtab"
#define _PATH_PROC_MOUNTS "/proc/mounts"
@@ -10,9 +9,8 @@ diff -Nur simpleinit-msb-1.2/lib/pathnames.h
simpleinit-msb-1.2-smgl/lib/pathnam
#define SWAPOFF_ARGS "swapoff", "-a"
/* used in login-utils/setpwnam.h and login-utils/islocal.c */
-diff -Nur simpleinit-msb-1.2/login-utils/shutdown.c
simpleinit-msb-1.2-smgl/login-utils/shutdown.c
---- simpleinit-msb-1.2/login-utils/shutdown.c 2001-09-26 12:59:46.000000000
+0200
-+++ simpleinit-msb-1.2-smgl/login-utils/shutdown.c 2004-02-20
15:53:27.000000000 +0100
+--- login-utils/shutdown.c.orig 2001-09-26 12:59:46.000000000 +0200
++++ login-utils/shutdown.c 2004-02-20 15:53:27.000000000 +0100
@@ -746,6 +746,7 @@
n = 0;
while (n < 100 && (mnt = getmntent(mtab))) {
@@ -21,9 +19,8 @@ diff -Nur simpleinit-msb-1.2/login-utils/shutdown.c
simpleinit-msb-1.2-smgl/logi
mntlist[n++] = strdup(mnt->mnt_dir);
}
endmntent(mtab);
-diff -Nur simpleinit-msb-1.2/login-utils/simpleinit.c
simpleinit-msb-1.2-smgl/login-utils/simpleinit.c
---- simpleinit-msb-1.2/login-utils/simpleinit.c 2004-01-11
00:24:42.000000000 +0100
-+++ simpleinit-msb-1.2-smgl/login-utils/simpleinit.c 2004-02-20
14:28:31.000000000 +0100
+--- login-utils/simpleinit.c.orig 2004-01-11 00:24:42.000000000 +0100
++++ login-utils/simpleinit.c 2004-02-20 14:28:31.000000000 +0100
@@ -321,6 +321,8 @@
void sigquit_handler (int sig);
void userspace_sigquit_handler (int sig);
- [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (7c20aa9bf687a8cfc42830fd47c71561d7d9eecc), Vlad Glagolev, 07/30/2008
Archive powered by MHonArc 2.6.24.