Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Ladislav Hagara (d136f54f6a282547bbad0e0a52133164e1dcd22f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Ladislav Hagara (d136f54f6a282547bbad0e0a52133164e1dcd22f)
  • Date: Thu, 30 Dec 2010 22:08:39 -0600

GIT changes to devel-xorg-modular grimoire by Ladislav Hagara <hgr AT vabo.cz>:

utils/installwatch/BUILD | 16 ------
utils/installwatch/DETAILS | 15 +++---
utils/installwatch/HISTORY | 4 +
utils/installwatch/INSTALL | 4 -
utils/installwatch/PRE_BUILD | 5 ++
utils/installwatch/installwatch-buffer.diff | 33 --------------
utils/installwatch/installwatch-cflags.diff | 24 ----------
utils/installwatch/installwatch-errno.diff | 55
------------------------
utils/installwatch/installwatch-ld-preload.diff | 13 -----
utils/installwatch/installwatch-syslog.diff | 12 -----
utils/installwatch/ld_preload.patch | 16 ++++++
utils/installwatch/localdecls.h | 8 ---
12 files changed, 34 insertions(+), 171 deletions(-)

New commits:
commit d136f54f6a282547bbad0e0a52133164e1dcd22f
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

installwatch 2010-12-12

diff --git a/utils/installwatch/BUILD b/utils/installwatch/BUILD
index e6385ef..d7cb532 100755
--- a/utils/installwatch/BUILD
+++ b/utils/installwatch/BUILD
@@ -1,15 +1 @@
-#!/bin/sh
-
-patch -p1 < "${SCRIPT_DIRECTORY}/installwatch-ld-preload.diff" &&
-patch -p1 < "${SCRIPT_DIRECTORY}/installwatch-errno.diff" &&
-patch -p1 < "${SCRIPT_DIRECTORY}/installwatch-buffer.diff" &&
-patch -p1 < "${SCRIPT_DIRECTORY}/installwatch-cflags.diff" &&
-patch -p1 < "${SCRIPT_DIRECTORY}/installwatch-syslog.diff" &&
-
-# If LIB is not defined, we do not have the bi-arch sorcery, so we
-# define LIB
-
-persistent_add LIB &&
-LIB="${LIB:-/lib}"
-make PREFIX="${TRACK_ROOT}/usr" LIBDIR="${TRACK_ROOT}/usr/${LIB}"
-
+make PREFIX="${TRACK_ROOT}/usr" LIBDIR="${TRACK_ROOT}/usr/lib"
diff --git a/utils/installwatch/DETAILS b/utils/installwatch/DETAILS
index c616a35..1ce2bc4 100755
--- a/utils/installwatch/DETAILS
+++ b/utils/installwatch/DETAILS
@@ -1,14 +1,13 @@
SPELL=installwatch
- VERSION=0.6.3
- PATCHLEVEL=3
- SOURCE=$SPELL-$VERSION.tar.gz
-
SOURCE_HASH=sha512:cdcf33903fa8b8716b88b1e81808351386b5c63a64f6d859a59cd78961aaa228c79d500e2df35473af0be5cd48b62619c75f399bb0c13d2f1e1a50234f3da70c
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-
SOURCE_URL[0]=http://asic-linux.com.mx/~izto/checkinstall/files/source/$SOURCE
+ VERSION=2010-12-12
+ PATCHLEVEL=0
+ SOURCE=$SPELL-$VERSION.tar.bz2
+
SOURCE_HASH=sha512:eda74e4a8b1707b7b5992e222baa8873b6248c0c9ef4475c521bef4dc3ba5374713ba09fc0acdaa369c67930865924994f4c15deb7b6b0e39cce5eeb6d24e50f
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
+ SOURCE_URL[0]=http://download.sourcemage.org/grimoire/distro/$SOURCE
+#
SOURCE_URL[0]=http://asic-linux.com.mx/~izto/checkinstall/files/source/$SOURCE

WEB_SITE=http://www.asic-linux.com.mx/~izto/checkinstall/installwatch.html
ENTERED=20011230
- UPDATED=20050106
- BI_ARCH_SPELL="yes"
KEYWORDS="utils"
SHORT="utility for tracking files during the installation of
software"
cat << EOF
diff --git a/utils/installwatch/HISTORY b/utils/installwatch/HISTORY
index 232a797..51eb4a0 100644
--- a/utils/installwatch/HISTORY
+++ b/utils/installwatch/HISTORY
@@ -1,3 +1,7 @@
+2010-12-12 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2010-12-12, up-to-date git version from:
+ http://checkinstall.izto.org/checkinstall.git
+
2009-08-19 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: fixed source url's extension (.tgz -> .tar.gz); regenerated
tarball; fixed desc; quoting paths
diff --git a/utils/installwatch/INSTALL b/utils/installwatch/INSTALL
index 19ed4a2..00d7ae0 100755
--- a/utils/installwatch/INSTALL
+++ b/utils/installwatch/INSTALL
@@ -1,3 +1 @@
-#!/bin/sh
-
-make BINDIR="${INSTALL_ROOT}/usr/bin" LIBDIR="${INSTALL_ROOT}/usr/${LIB}"
install
+make BINDIR="${INSTALL_ROOT}/usr/bin" LIBDIR="${INSTALL_ROOT}/usr/lib"
install
diff --git a/utils/installwatch/PRE_BUILD b/utils/installwatch/PRE_BUILD
new file mode 100755
index 0000000..5fccc23
--- /dev/null
+++ b/utils/installwatch/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch Makefile < $SPELL_DIRECTORY/ld_preload.patch &&
+sed -i "s:PREFIX=/usr/local:PREFIX=/usr:" Makefile
diff --git a/utils/installwatch/installwatch-buffer.diff
b/utils/installwatch/installwatch-buffer.diff
deleted file mode 100644
index c6c8093..0000000
--- a/utils/installwatch/installwatch-buffer.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -urN installwatch-0.6.3.ori/installwatch.c
installwatch-0.6.3/installwatch.c
---- installwatch-0.6.3.ori/installwatch.c 2004-08-30 14:47:35.917768321
+0000
-+++ installwatch-0.6.3/installwatch.c 2004-08-30 14:51:30.568600728 +0000
-@@ -142,11 +142,17 @@
- va_start(ap, format);
- count = vsnprintf(buffer, BUFSIZE, format, ap);
- va_end(ap);
-+
-+ buffer [BUFSIZE - 2] = '\n';
-+ buffer [BUFSIZE - 1] = 0;
-+
- if(count == -1) {
- /* The buffer was not big enough */
- strcpy(&(buffer[BUFSIZE - 5]), "...\n");
- count = BUFSIZE - 1;
-- }
-+ } else {
-+ count = strlen(buffer);
-+ }
- if((logname = getenv("INSTALLWATCHFILE"))) {
- logfd = true_open(logname, O_WRONLY | O_CREAT | O_APPEND,
0666);
- if(logfd >= 0) {
-@@ -179,8 +185,9 @@
- * to the current working directory if it was not
- * an absolute path */
- getcwd(resolved_path, MAXPATHLEN - 2);
-+ resolved_path[MAXPATHLEN - 2] = 0;
- strcat(resolved_path, "/");
-- strncat(resolved_path, path, MAXPATHLEN - 1);
-+ strncat(resolved_path, path, MAXPATHLEN - 1 -
strlen(resolved_path));
- }
-
- errno = s_errno;
diff --git a/utils/installwatch/installwatch-cflags.diff
b/utils/installwatch/installwatch-cflags.diff
deleted file mode 100644
index 0078dfa..0000000
--- a/utils/installwatch/installwatch-cflags.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- installwatch-0.6.3/Makefile.ori 2004-09-08 16:05:24.475554253 +0200
-+++ installwatch-0.6.3/Makefile 2004-09-08 16:06:55.238768317 +0200
-@@ -16,10 +16,10 @@
- all: installwatch.so
-
- installwatch.so: installwatch.o
-- ld -shared -o installwatch.so installwatch.o -ldl -lc
-+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -nostdlib -o installwatch.so
installwatch.o -ldl -lc
-
- installwatch.o: installwatch.c localdecls.h
-- gcc -Wall -c -D_GNU_SOURCE -DPIC -fPIC -D_REENTRANT
-DVERSION=\"$(VERSION)\" installwatch.c
-+ $(CC) $(CFLAGS) -c -D_GNU_SOURCE -DPIC -fPIC -D_REENTRANT
-DVERSION=\"$(VERSION)\" installwatch.c
-
- localdecls.h:
- ./create-localdecls
-@@ -33,7 +33,7 @@
- uninstall:
- rm $(LIBDIR)/installwatch.so
- rm $(BINDIR)/installwatch
--
-+
- clean:
- rm -f *~ *.bak *.o installwatch.so core localdecls.h libctest
test-installwatch
-
diff --git a/utils/installwatch/installwatch-errno.diff
b/utils/installwatch/installwatch-errno.diff
deleted file mode 100644
index f58ecda..0000000
--- a/utils/installwatch/installwatch-errno.diff
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -Naur installwatch-0.6.3/installwatch.c
installwatch-0.6.3-new/installwatch.c
---- installwatch-0.6.3/installwatch.c 2001-12-23 00:37:06.000000000 +0100
-+++ installwatch-0.6.3-new/installwatch.c 2004-01-08 01:58:25.000000000
+0100
-@@ -134,7 +134,10 @@
- static void log(const char *format, ...) {
- char buffer[BUFSIZE], *logname;
- va_list ap;
-- int count, logfd;
-+ int count, logfd, s_errno;
-+
-+ /* save errno */
-+ s_errno = errno;
-
- va_start(ap, format);
- count = vsnprintf(buffer, BUFSIZE, format, ap);
-@@ -156,9 +159,21 @@
-
- } else
- syslog(LOGLEVEL, buffer);
-+
-+ /* restore errno */
-+ errno = s_errno;
- }
-
- static void canonicalize(const char *path, char *resolved_path) {
-+
-+ /* 2004/01/08 Benoit PAPILLAULT <benoit.papillault AT free.fr>
-+ Since this function can change errno, we save and restore it
-+ */
-+
-+ int s_errno;
-+
-+ s_errno = errno;
-+
- if(!realpath(path, resolved_path) && (path[0] != '/')) {
- /* The path could not be canonicalized, append it
- * to the current working directory if it was not
-@@ -167,6 +182,8 @@
- strcat(resolved_path, "/");
- strncat(resolved_path, path, MAXPATHLEN - 1);
- }
-+
-+ errno = s_errno;
- }
-
- static void make_path (char *path) {
-@@ -532,7 +549,7 @@
-
- backup (canonic);
-
-- result = true_chown(path, owner, group);
-+ result = true_lchown(path, owner, group);
- log("%d\tlchown\t%s\t%d\t%d\t#%s\n", result, canonic, owner, group,
error(result));
- return result;
- }
diff --git a/utils/installwatch/installwatch-ld-preload.diff
b/utils/installwatch/installwatch-ld-preload.diff
deleted file mode 100644
index 966b5b7..0000000
--- a/utils/installwatch/installwatch-ld-preload.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur installwatch-0.6.3.ori/Makefile installwatch-0.6.3/Makefile
---- installwatch-0.6.3.ori/Makefile 2001-12-22 23:37:06.000000000 +0000
-+++ installwatch-0.6.3/Makefile 2003-09-20 20:31:52.000000000 +0000
-@@ -25,8 +25,8 @@
- ./create-localdecls
-
- install: all
-- if [ -r $(LIBDIR)/installwatch.so ]; then rm
$(LIBDIR)/installwatch.so; export LD_PRELOAD=""; cp installwatch.so
$(LIBDIR); LD_PRELOAD=$(LIBDIR)/installwatch.so; else cp installwatch.so
$(LIBDIR); fi
--
-+ cp installwatch.so $(LIBDIR)/installwatch.so.new
-+ mv $(LIBDIR)/installwatch.so.new $(LIBDIR)/installwatch.so
- sed -e "s|#PREFIX#|$(PREFIX)|" < installwatch > $(BINDIR)/installwatch
- chmod 755 $(BINDIR)/installwatch
diff --git a/utils/installwatch/installwatch-syslog.diff
b/utils/installwatch/installwatch-syslog.diff
deleted file mode 100644
index 8364e45..0000000
--- a/utils/installwatch/installwatch-syslog.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN installwatch-0.6.3/installwatch.c installwatch-0.6.4/installwatch.c
---- installwatch-0.6.3/installwatch.c 2004-11-10 17:34:11.817461389 +0100
-+++ installwatch-0.6.4/installwatch.c 2004-11-10 17:00:42.614038577 +0100
-@@ -164,7 +164,7 @@
- syslog(LOGLEVEL, "Could not open `%s' to write `%s':
%s\n", logname, buffer, strerror(errno));
-
- } else
-- syslog(LOGLEVEL, buffer);
-+ syslog(LOGLEVEL, "%s", buffer);
-
- /* restore errno */
- errno = s_errno;
diff --git a/utils/installwatch/ld_preload.patch
b/utils/installwatch/ld_preload.patch
new file mode 100644
index 0000000..ae706dd
--- /dev/null
+++ b/utils/installwatch/ld_preload.patch
@@ -0,0 +1,16 @@
+--- Makefile.ori 2010-02-03 16:59:10.000000000 +0100
++++ Makefile 2010-02-03 18:02:11.000000000 +0100
+@@ -27,11 +27,8 @@
+ install: all
+ mkdir -p $(LIBDIR)
+ mkdir -p $(BINDIR)
+- if [ -r $(LIBDIR)/installwatch.so ]; then \
+- rm -f $(LIBDIR)/installwatch.so; \
+- fi
+- install installwatch.so $(LIBDIR)
+-
++ cp installwatch.so $(LIBDIR)/installwatch.so.new
++ mv $(LIBDIR)/installwatch.so.new $(LIBDIR)/installwatch.so
+ sed -e "s|#PREFIX#|$(PREFIX)|" < installwatch > $(BINDIR)/installwatch
+ chmod 755 $(BINDIR)/installwatch
+
diff --git a/utils/installwatch/localdecls.h b/utils/installwatch/localdecls.h
deleted file mode 100755
index 050420e..0000000
--- a/utils/installwatch/localdecls.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef __LOCALDECLS_H_
-#define __LOCALDECLS_H_
-
-#define TRUNCATE_T off_t
-#define LIBC_VERSION "libc.so.6"
-#define GLIBC_MINOR 2
-
-#endif



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Ladislav Hagara (d136f54f6a282547bbad0e0a52133164e1dcd22f), Ladislav Hagara, 12/30/2010

Archive powered by MHonArc 2.6.24.

Top of Page