[SM-Commit] GIT changes to master grimoire by Pol Vinogradov (251ecd22bc63bb03dd1c3a855930cab705ab7656)

Pol Vinogradov scm at sourcemage.org
Mon Oct 22 23:18:07 EDT 2007


GIT changes to master grimoire by Pol Vinogradov <vin.public at gmail.com>:

 utils/watchdog/BUILD               |    3 ---
 utils/watchdog/DETAILS             |    5 ++---
 utils/watchdog/HISTORY             |    6 +++++-
 utils/watchdog/watchdog-gcc3.patch |   27 ---------------------------
 4 files changed, 7 insertions(+), 34 deletions(-)

New commits:
commit 251ecd22bc63bb03dd1c3a855930cab705ab7656
Author: Pol Vinogradov <vin.public at gmail.com>
Commit: Pol Vinogradov <vin.public at gmail.com>

    utils/watchdog:
    
    DETAILS: updated to 5.4
    BUILD, watchdog-gcc33.patch: removed, not needed anymore

diff --git a/utils/watchdog/BUILD b/utils/watchdog/BUILD
deleted file mode 100755
index d3cea88..0000000
--- a/utils/watchdog/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-  patch -p1 < $SCRIPT_DIRECTORY/watchdog-gcc3.patch	&&
-
-  default_build   
diff --git a/utils/watchdog/DETAILS b/utils/watchdog/DETAILS
index 66bdee9..3438dbe 100755
--- a/utils/watchdog/DETAILS
+++ b/utils/watchdog/DETAILS
@@ -1,5 +1,5 @@
            SPELL=watchdog
-         VERSION=5.2
+         VERSION=5.4
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://www.ibiblio.org/pub/Linux/system/daemons/$SPELL/$SOURCE
@@ -7,11 +7,10 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[2]=ftp://ftp.cse.cuhk.edu.hk/pub1/Linux/system/daemons/$SPELL/$SOURCE
    SOURCE_URL[3]=ftp://ftp.fee.vutbr.cz/pub/systems/linux/current/system/daemons/$SPELL/$SOURCE
    SOURCE_URL[4]=ftp://ftp.uni-jena.de/pub/linux/MIRROR.sunsite/system/daemons/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:6229e9c2ababf8067a34620c4cd25a87519cbb61d849bcaabca361b52b668db20969402ee35ed4301c6113795e3d0f189f07145467a1d673ab15f85a5cccbe6c
+     SOURCE_HASH=sha512:f4af5802eee0b2d5c70a7650587a543d0a9ce5a301213b20cd0ac2c5d8c3cc526d6606b2b746e065342f05e1bd1952987062bc468c6a3795c52200ef6f9c0ad6
       LICENSE[0]=GPL
         WEB_SITE=http://www.gnu.org/directory/System_administration/monitor/watchdog.html
          ENTERED=20030731
-      PATCHLEVEL=1
         KEYWORDS="utils"
            SHORT="A software watchdog daemon"
 cat << EOF
diff --git a/utils/watchdog/HISTORY b/utils/watchdog/HISTORY
index ee28411..c883ef3 100644
--- a/utils/watchdog/HISTORY
+++ b/utils/watchdog/HISTORY
@@ -1,6 +1,10 @@
+2007-10-23 Pol Vinogradov <vin.public at gmail.com>
+	* DETAILS: updated to 5.4
+	* BUILD, watchdog-gcc33.patch: removed, not needed anymore
+
 2007-10-21 Pol Vinogradov <vin.public at gmail.com>
 	* init.d/watchdog: fixed paths for devices files, make
-	  /dev/temperature existance check optional, added -f key to lnsx
+	  /dev/temperature existance check optional, added -f key to lns
 
 2007-10-20 Pol Vinogradov <vin.public at gmail.com>
 	* DETAILS: removed UPDATED, PATCHLEVEL++
diff --git a/utils/watchdog/watchdog-gcc3.patch b/utils/watchdog/watchdog-gcc3.patch
deleted file mode 100644
index aff7b52..0000000
--- a/utils/watchdog/watchdog-gcc3.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Nur watchdog-5.2-orig/include/sundries.h watchdog-5.2/include/sundries.h
---- watchdog-5.2-orig/include/sundries.h	1998-09-10 17:19:11.000000000 +0200
-+++ watchdog-5.2/include/sundries.h	2003-07-31 01:40:07.000000000 +0200
-@@ -51,7 +51,7 @@
- #if defined(__GNUC_MINOR__) && __GNUC__ == 2 && __GNUC_MINOR__ >= 5
- void die (int errcode, const char *fmt, ...) __attribute__ ((noreturn));
- #else /* GNUC < 2.5 */
--void volatile die (int errcode, const char *fmt, ...);
-+void die (int errcode, const char *fmt, ...);
- #endif /* GNUC < 2.5 */
- #else /* !__GNUC__ */
- void die (int errcode, const char *fmt, ...);
-diff -Nur watchdog-5.2-orig/src/quotactl.c watchdog-5.2/src/quotactl.c
---- watchdog-5.2-orig/src/quotactl.c	1999-09-09 11:03:06.000000000 +0200
-+++ watchdog-5.2/src/quotactl.c	2003-07-31 01:40:26.000000000 +0200
-@@ -34,9 +34,10 @@
- 	return syscall(__NR_quotactl, cmd, special, id, addr);
- }
- #else
-+#include <errno.h>
- #include <sys/types.h>
- #define __LIBRARY__
- #include <linux/unistd.h>
- 
--_syscall4(int, quotactl, int, cmd, const char *, special, int, id, caddr_t, addr);
-+_syscall4(int quotactl, int cmd, const char * special, int id, caddr_t addr);
- #endif



More information about the SM-Commit mailing list