Hello community,
here is the log from the commit of package loki_setup
checked in at Wed Apr 4 19:34:06 CEST 2007.
--------
--- loki_setup/loki_setup.changes 2006-12-12 11:45:20.000000000 +0100
+++ /mounts/work_src_done/STABLE/loki_setup/loki_setup.changes 2007-04-04 17:12:25.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Apr 4 17:11:52 CEST 2007 - lnussel@suse.de
+
+- update loki-setup and loki-setupdb to current cvs
+- add zlib-devel and ncurses-devel to build requires
+
+-------------------------------------------------------------------
Old:
----
loki_setupdb-strncat.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ loki_setup.spec ++++++
--- /var/tmp/diff_new_pack.k25253/_old 2007-04-04 19:33:40.000000000 +0200
+++ /var/tmp/diff_new_pack.k25253/_new 2007-04-04 19:33:40.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package loki_setup (Version 1.6.5_20060530)
+# spec file for package loki_setup (Version 1.6.5_20070404)
#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -11,13 +11,13 @@
# norootforbuild
Name: loki_setup
-BuildRequires: gpm gtk1-compat-devel gtk2-devel libglade2-devel pkgconfig python python-xml update-desktop-files xdelta
+BuildRequires: gpm gtk1-compat-devel gtk2-devel libglade2-devel ncurses-devel pkgconfig python python-xml update-desktop-files xdelta zlib-devel
%define do_brandelf 1
License: GNU General Public License (GPL)
URL: http://icculus.org/loki_setup/
Group: Development/Tools/Other
-Version: 1.6.5_20060530
-Release: 27
+Version: 1.6.5_20070404
+Release: 1
Summary: Installer Program Mainly for Games
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: loki_setup-current.tar.bz2
@@ -46,7 +46,6 @@
# setupdb
Patch20: loki_setupdb-signed-char.diff
Patch21: loki_setupdb-Makefile.diff
-Patch22: loki_setupdb-strncat.diff
# update
Patch41: loki_update-adig.diff
Patch42: loki_update-snarf.diff
@@ -70,7 +69,7 @@
%package -n loki_uninstall
Version: 1.0.3_20051201
-Release: 40
+Release: 59
Summary: Uninstall program for games
Group: Amusements/Games/Other
@@ -87,7 +86,7 @@
%package -n loki_update
Version: 1.0.13_20040208
-Release: 75
+Release: 94
Summary: Updater program for games
Group: Amusements/Games/Other
@@ -147,7 +146,6 @@
cd loki_setupdb
qpatch %{PATCH20}
qpatch %{PATCH21}
-qpatch %{PATCH22}
qpush
cd ..
#
@@ -170,6 +168,7 @@
qpush
popd
find -type d -name CVS -print0 |xargs -0 rm -rv
+# XXX: *waahh*!!!!
# GTK2 issues:
sed -i 's/\.gtk /.gtk2 /;s/\([^2]\).glade/\1.gtk2.glade/' loki-setup loki-uninstall
libglade-convert --no-upgrade loki_update/loki_update.glade | sed 's:"pixbuf">:&pixmaps/:' >loki_update/loki_update.gtk2.glade
@@ -402,7 +401,10 @@
%{_bindir}/make_patch
%{_datadir}/loki_patch
-%changelog -n loki_setup
+%changelog
+* Wed Apr 04 2007 - lnussel@suse.de
+- update loki-setup and loki-setupdb to current cvs
+- add zlib-devel and ncurses-devel to build requires
* Tue Dec 12 2006 - lnussel@suse.de
- fix some wrong uses of strncat()
* Tue Nov 07 2006 - ro@suse.de
++++++ loki_setup-current.tar.bz2 ++++++
++++ 8910 lines of diff (skipped)
++++++ loki_setupdb-current.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/loki_setupdb/arch.c new/loki_setupdb/arch.c
--- old/loki_setupdb/arch.c 2005-09-10 02:12:47.000000000 +0200
+++ new/loki_setupdb/arch.c 2006-06-07 16:33:49.000000000 +0200
@@ -1,4 +1,4 @@
-/* $Id: arch.c,v 1.21 2005/09/10 00:12:47 megastep Exp $ */
+/* $Id: arch.c,v 1.22 2006/06/07 00:12:42 megastep Exp $ */
#include
#include
@@ -109,7 +109,17 @@
"fgrep GLIBC_2.1 %s 2>&1 >/dev/null", libcfile );
if ( system(buffer) == 0 )
return "glibc-2.1";
-
+
+ /* Fallback - some newer distros don't even define 2.1 anymore */
+ snprintf( buffer, sizeof(buffer),
+ "fgrep GLIBC_2.2 %s 2>&1 >/dev/null", libcfile );
+ if ( system(buffer) == 0 )
+ return "glibc-2.1"; /* Intentional! */
+ snprintf( buffer, sizeof(buffer),
+ "fgrep GLIBC_2.3 %s 2>&1 >/dev/null", libcfile );
+ if ( system(buffer) == 0 )
+ return "glibc-2.1"; /* Intentional! */
+
return "glibc-2.0";
}
/* Default to version 5 */
@@ -227,7 +237,8 @@
"SGI IRIX",
"SCO UnixWare/OpenServer",
"IBM AIX",
- "MacOS X / Darwin"
+ "MacOS X / Darwin",
+ "Ubuntu Linux"
};
const char *distribution_symbol[NUM_DISTRIBUTIONS] = {
@@ -249,7 +260,8 @@
"irix",
"sco",
"aix",
- "darwin"
+ "darwin",
+ "ubuntu"
};
/* Detect the distribution type and version */
@@ -319,7 +331,11 @@
return DISTRO_REDHAT;
} else if ( !access("/etc/debian_version", F_OK) ) {
find_version("/etc/debian_version", maj_ver, min_ver);
- return DISTRO_DEBIAN;
+ if ( access("/usr/share/doc/ubuntu-base", F_OK) ) {
+ return DISTRO_DEBIAN;
+ } else {
+ return DISTRO_UBUNTU;
+ }
} else if ( !access("/etc/slackware-version", F_OK) ) {
find_version("/etc/slackware-version", maj_ver, min_ver);
return DISTRO_SLACKWARE;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/loki_setupdb/arch.h new/loki_setupdb/arch.h
--- old/loki_setupdb/arch.h 2006-01-27 22:50:13.000000000 +0100
+++ new/loki_setupdb/arch.h 2006-06-07 16:33:49.000000000 +0200
@@ -66,6 +66,7 @@
DISTRO_SCO,
DISTRO_AIX,
DISTRO_DARWIN,
+ DISTRO_UBUNTU,
NUM_DISTRIBUTIONS
} distribution;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/loki_setupdb/CHANGES new/loki_setupdb/CHANGES
--- old/loki_setupdb/CHANGES 2006-05-18 17:43:04.000000000 +0200
+++ new/loki_setupdb/CHANGES 2006-06-07 16:33:49.000000000 +0200
@@ -1,4 +1,6 @@
current:
+Stephane Peter (Codehost) - Tue Jun 6 16:59:03 PDT 2006
+ * Improved glibc detection on newer distros (Ubuntu)
Ryan C. Gordon (???) - Thu May 18 08:35:16 PDT 2006
* Generated uninstall script will try falling back to x86 binaries on
amd64 if native binaries don't exist.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/loki_setupdb/configure.in new/loki_setupdb/configure.in
--- old/loki_setupdb/configure.in 2006-03-25 00:24:05.000000000 +0100
+++ new/loki_setupdb/configure.in 2006-10-26 13:35:46.000000000 +0200
@@ -144,15 +144,22 @@
, with_libxml2=no)
if test x$with_libxml2 != xno; then
XMLVER="2"
- EXTRA_LIBS="$EXTRA_LIBS -lm"
fi
AC_PATH_PROG(HAVEXML, xml${XMLVER}-config, $PATH)
if test ! -z "$HAVEXML"; then
XML_CFLAGS=`$HAVEXML --cflags`
- XML_LIBS=`$HAVEXML --libs`
XML_PREFIX=`$HAVEXML --prefix`
+ if "$HAVEXML" --help|grep libtool-libs > /dev/null; then
+ XML_LIBTOOL=`$HAVEXML --libtool-libs`
+ . "$XML_LIBTOOL"
+ XML_LIBS="$dependency_libs"
+ elif "$HAVEXML" --libs | grep thread > /dev/null; then
+ XML_LIBS="$PTHREAD -lm"
+ fi
+ EXTRA_LIBS="$EXTRA_LIBS $XML_LIBS"
+
CFLAGS="$CFLAGS $XML_CFLAGS"
LIBS="$LIBS $XML_PREFIX/lib$LIBSUFFIX/libxml${XMLVER}.a $BSTATIC $ZLIB $BDYNAMIC $EXTRA_LIBS"
else
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/loki_setupdb/convert.c new/loki_setupdb/convert.c
--- old/loki_setupdb/convert.c 2003-03-07 05:04:52.000000000 +0100
+++ new/loki_setupdb/convert.c 2007-01-23 17:18:16.000000000 +0100
@@ -1,5 +1,5 @@
/* Tool to convert old 'uninstall' scripts generated by setup into an XML file */
-/* $Id: convert.c,v 1.24 2003/03/07 04:04:52 megastep Exp $ */
+/* $Id: convert.c,v 1.25 2006/12/12 20:02:52 megastep Exp $ */
#include
#include
@@ -36,8 +36,8 @@
strncpy(buf, path, sizeof(buf));
} else {
getcwd(buf, sizeof(buf));
- strncat(buf, "/", sizeof(buf));
- strncat(buf, path, sizeof(buf));
+ strncat(buf, "/", sizeof(buf)-strlen(buf)-1);
+ strncat(buf, path, sizeof(buf)-strlen(buf)-1);
}
ptr = strrchr(buf, '/');
if ( ptr ) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/loki_setupdb/register.c new/loki_setupdb/register.c
--- old/loki_setupdb/register.c 2005-02-05 03:05:34.000000000 +0100
+++ new/loki_setupdb/register.c 2006-06-08 09:18:01.000000000 +0200
@@ -1,12 +1,13 @@
/* Command-line utility to manipulate product entries from scripts */
-/* $Id: register.c,v 1.14 2005/02/05 02:05:34 megastep Exp $ */
+/* $Id: register.c,v 1.16 2006/06/07 23:35:45 megastep Exp $ */
#include
#include
#include
#include
+#include "arch.h"
#include "setupdb.h"
product_t *product;
@@ -14,25 +15,27 @@
void print_usage(const char *argv0)
{
printf("Usage: %s <product> [command] [args]\n"
- "Recognized commands are :\n"
- " create <component> <version> [option_name [option_tag]]\n"
- " Create a new component and/or option in the component\n"
- " add <component> <option> [file [file ...]]\n"
- " Register files in the component / option\n"
- " script <component> <name> <path-to-script>\n"
- " Register a new pre/post-uninstall script for the component\n"
- " update <component> <option> <files>\n"
- " Updates registration information\n"
- " message <component> <\"message\">\n"
- " Add an uninstallation warning message to the component\n"
- " remove file [file [file ...]]\n"
- " Remove specified files from the product\n"
- " listfiles [component]\n"
- " List files installed under product [or component]\n"
- " desktop <component> <binary>\n"
- " List all desktop items installed for a binary\n"
- " printtags [component]\n"
- " Print installed option tags\n",
+ "Recognized commands are :\n"
+ " create <component> <version> [option_name [option_tag]]\n"
+ " Create a new component and/or option in the component\n"
+ " add <component> <option> [file [file ...]]\n"
+ " Register files in the component / option\n"
+ " script <component> <name> <path-to-script>\n"
+ " Register a new pre/post-uninstall script for the component\n"
+ " update <component> <option> <files>\n"
+ " Updates registration information\n"
+ " message <component> <\"message\">\n"
+ " Add an uninstallation warning message to the component\n"
+ " remove file [file [file ...]]\n"
+ " Remove specified files from the product\n"
+ " listfiles [component]\n"
+ " List files installed under product [or component]\n"
+ " desktop <component> <binary>\n"
+ " List all desktop items installed for a binary\n"
+ " printtags [component]\n"
+ " Print installed option tags\n"
+ " sysinfo\n"
+ " Print out system information as detected.\n",
argv0);
}
@@ -248,6 +251,15 @@
return 1;
}
+ if ( !strcmp(argv[2], "sysinfo") ) {
+ int maj = 0, min = 0;
+ distribution distro = detect_distro(&maj, &min);
+ printf("OS='%s' Distro='%s' Ver=%d.%d Arch='%s' Libc='%s'\n", detect_os(),
+ distribution_name[distro], maj, min,
+ detect_arch(), detect_libc());
+ return 0;
+ }
+
product = loki_openproduct(argv[1]);
if ( ! product ) {
fprintf(stderr,"Unable to open product %s\n", argv[1]);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/loki_setupdb/setupdb.c new/loki_setupdb/setupdb.c
--- old/loki_setupdb/setupdb.c 2006-05-18 17:43:04.000000000 +0200
+++ new/loki_setupdb/setupdb.c 2007-04-04 16:35:50.000000000 +0200
@@ -1,5 +1,5 @@
/* Implementation of the Loki Product DB API */
-/* $Id: setupdb.c,v 1.87 2006/05/18 15:43:04 icculus Exp $ */
+/* $Id: setupdb.c,v 1.89 2007/01/26 03:01:22 megastep Exp $ */
#include "config.h"
#include
@@ -646,11 +646,11 @@
snprintf(homefile, sizeof(homefile), "%s/" LOKI_DIRNAME, detect_home());
mkdir(homefile, 0700);
- strncat(homefile, "/installed", sizeof(homefile)-strlen(homefile));
+ strncat(homefile, "/installed", sizeof(homefile)-strlen(homefile)-1);
mkdir(homefile, 0700);
- strncat(homefile, "/", sizeof(homefile)-strlen(homefile));
- strncat(homefile, get_xml_base(), sizeof(homefile)-strlen(homefile));
+ strncat(homefile, "/", sizeof(homefile)-strlen(homefile)-1);
+ strncat(homefile, get_xml_base(), sizeof(homefile)-strlen(homefile)-1);
mkdir(homefile, 0700);
/* Clean up the root - it can't have a trailing slash */
@@ -667,13 +667,13 @@
return NULL;
}
- strncat(homefile, "/", sizeof(homefile)-strlen(homefile));
- strncat(homefile, name, sizeof(homefile)-strlen(homefile));
- strncat(homefile, ".xml", sizeof(homefile)-strlen(homefile));
-
- strncat(manifest, "/", sizeof(manifest)-strlen(manifest));
- strncat(manifest, name, sizeof(manifest)-strlen(manifest));
- strncat(manifest, ".xml", sizeof(manifest)-strlen(manifest));
+ strncat(homefile, "/", sizeof(homefile)-strlen(homefile)-1);
+ strncat(homefile, name, sizeof(homefile)-strlen(homefile)-1);
+ strncat(homefile, ".xml", sizeof(homefile)-strlen(homefile)-1);
+
+ strncat(manifest, "/", sizeof(manifest)-strlen(manifest)-1);
+ strncat(manifest, name, sizeof(manifest)-strlen(manifest)-1);
+ strncat(manifest, ".xml", sizeof(manifest)-strlen(manifest)-1);
/* Symlink the file in the 'installed' per-user directory */
@@ -2258,15 +2258,15 @@
snprintf(binpath, sizeof(binpath), "%s/" LOKI_DIRNAME "/installed/bin", detect_home());
mkdir(binpath, 0755);
- strncat(binpath, "/", sizeof(binpath));
- strncat(binpath, os_name, sizeof(binpath));
+ strncat(binpath, "/", sizeof(binpath)-strlen(binpath)-1);
+ strncat(binpath, os_name, sizeof(binpath)-strlen(binpath)-1);
mkdir(binpath, 0755);
- strncat(binpath, "/", sizeof(binpath));
- strncat(binpath, detect_arch(), sizeof(binpath));
+ strncat(binpath, "/", sizeof(binpath)-strlen(binpath)-1);
+ strncat(binpath, detect_arch(), sizeof(binpath)-strlen(binpath)-1);
mkdir(binpath, 0755);
- strncat(binpath, "/uninstall", sizeof(binpath));
+ strncat(binpath, "/uninstall", sizeof(binpath)-strlen(binpath)-1);
if ( !access(binpath, X_OK) && !access(src_bins, R_OK) ) {
char cmd[PATH_MAX];
@@ -2369,7 +2369,7 @@
lang);
mkdir(binpath, 0755);
- strncat(binpath, "/LC_MESSAGES", sizeof(binpath));
+ strncat(binpath, "/LC_MESSAGES", sizeof(binpath)-strlen(binpath)-1);
mkdir(binpath, 0755);
snprintf(binpath, sizeof(binpath),
@@ -2442,14 +2442,14 @@
"FindBinary()\n"
"{\n"
" arch=$1\n"
- " if which loki-uninstall 2> /dev/null > /dev/null || type -p loki-uninstall 2> /dev/null > /dev/null; then\n"
- " if loki-uninstall -v > /dev/null 2> /dev/null; then\n"
- " echo `exec 2>&-; which loki-uninstall || type loki-uninstall`\n"
+ " if which " LOKI_PREFIX "-uninstall 2> /dev/null > /dev/null || type -p " LOKI_PREFIX "-uninstall 2> /dev/null > /dev/null; then\n"
+ " if " LOKI_PREFIX "-uninstall -v > /dev/null 2> /dev/null; then\n"
+ " echo `exec 2>&-; which " LOKI_PREFIX "-uninstall || type " LOKI_PREFIX "-uninstall`\n"
" else\n"
- " echo \"$HOME/.loki/installed/bin/`DetectOS`/$arch/uninstall\"\n"
+ " echo \"$HOME/" LOKI_DIRNAME "/installed/bin/`DetectOS`/$arch/uninstall\"\n"
" fi\n"
" else\n"
- " echo \"$HOME/.loki/installed/bin/`DetectOS`/$arch/uninstall\"\n"
+ " echo \"$HOME/" LOKI_DIRNAME "/installed/bin/`DetectOS`/$arch/uninstall\"\n"
" fi\n"
"}\n\n"
++++++ loki_update-Makefile.diff ++++++
--- /var/tmp/diff_new_pack.k25253/_old 2007-04-04 19:33:42.000000000 +0200
+++ /var/tmp/diff_new_pack.k25253/_new 2007-04-04 19:33:42.000000000 +0200
@@ -9,7 +9,7 @@
-LFLAGS += $(shell xml-config --libs)
-LFLAGS += -lxml -lz
LFLAGS += -Wl,-Bdynamic
-+LFLAGS += $(shell xml-config --libs)
++LFLAGS += $(shell xml-config --libs) -lz
LFLAGS += -lm -ldl
TTY_LFLAGS =
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org