[SM-Commit] GIT changes to master grimoire by Jaka Kranjc (8faef64ec8c34e53addf6e98cf8e1517008c5055)

Jaka Kranjc scm at mail.sourcemage.org
Sat Oct 21 06:37:31 EDT 2006


GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx at sourcemage.org>:

 ChangeLog                |    3 +++
 accounts                 |    1 +
 groups                   |    1 +
 security/iplog/BUILD     |    6 ------
 security/iplog/HISTORY   |    5 +++++
 security/iplog/INSTALL   |    1 +
 security/iplog/PREPARE   |   13 -------------
 security/iplog/PRE_BUILD |    6 ++++++
 8 files changed, 17 insertions(+), 19 deletions(-)

New commits:
commit d17d6533731d713609466187688eb68184180be1
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    iplog: fix #12980 and make it build

diff --git a/ChangeLog b/ChangeLog
index 0576ce8..6cacd8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2006-10-21 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* accounts, groups: added iplog
+
 2006-10-20 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* security/netpipe renamed to netpipe-redirector to avoid conflict #8580
 
diff --git a/accounts b/accounts
index 72144ba..5ffc0e4 100755
--- a/accounts
+++ b/accounts
@@ -60,3 +60,4 @@ boinc:152:152
 pascal:153:153
 wnn:154:154
 musicdaemon:155:29
+iplog:156:156
diff --git a/groups b/groups
index d02725b..84646d9 100755
--- a/groups
+++ b/groups
@@ -71,4 +71,5 @@ boinc:152:
 pascal:153:
 wnn:154:
 powerdev:155:
+iplog:156:
 nogroup:65534:
diff --git a/security/iplog/BUILD b/security/iplog/BUILD
deleted file mode 100755
index 0406899..0000000
--- a/security/iplog/BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-./configure  --build=${BUILD}                     \
-             --prefix=${INSTALL_ROOT}/usr         \
-             --sysconfdir=${INSTALL_ROOT}/etc     \
-             --localstatedir=${INSTALL_ROOT}/var  \
-             ${OPTS}                              &&
-make
diff --git a/security/iplog/HISTORY b/security/iplog/HISTORY
index aed7432..444cb5f 100644
--- a/security/iplog/HISTORY
+++ b/security/iplog/HISTORY
@@ -1,3 +1,8 @@
+2006-10-21 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* PREPARE, BUILD: removed
+	* PRE_BUILD: added, fix compilation with sed
+	* INSTALL: added create_account #12980
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/security/iplog/INSTALL b/security/iplog/INSTALL
index f9fa671..a6abbe5 100755
--- a/security/iplog/INSTALL
+++ b/security/iplog/INSTALL
@@ -1,3 +1,4 @@
+create_account iplog &&
 default_install  &&
 
 touch  /var/log/iplog  &&
diff --git a/security/iplog/PREPARE b/security/iplog/PREPARE
deleted file mode 100755
index babe10b..0000000
--- a/security/iplog/PREPARE
+++ /dev/null
@@ -1,13 +0,0 @@
-message "Creation of ${SPELL} user ${MESSAGE_COLOR} iplog ${DEFAULT_COLOR}."
-
-if  !  exists_account  iplog;  then
-    message "${MESSAGE_COLOR} ERROR:${DEFAULT_COLOR} The ${SPELL} user and group was not yet defined.";
-    message "Solution: "
-    message "          echo "iplog:120:120" >> /etc/sorcery/accounts"
-    message "          echo "iplog:120:" >> /etc/sorcery/groups"
-    return  1
-else
-    if  [  "`grep  'iplog'  /etc/passwd`"  ==  ""  ];  then
-        create_account  iplog
-    fi
-fi
diff --git a/security/iplog/PRE_BUILD b/security/iplog/PRE_BUILD
new file mode 100755
index 0000000..6c28f04
--- /dev/null
+++ b/security/iplog/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sed -i '/"Usage: " PACKAGE "/,/--log-null-sc/ {
+  s/^\([^"]\)/"\1/
+  s/\([^",]\)$/\1\\n"/
+}' src/iplog_options.c



More information about the SM-Commit mailing list