- Pacman-dev - lists.archlinux.org

[pacman-dev] CVS update of pacman-lib (configure.ac)
by Juergen Hoetzel 01 Feb '07

01 Feb '07

Date: Thursday, February 1, 2007 @ 14:50:08 Author: juergen Path: /home/cvs-pacman/pacman-lib Modified: configure.ac (1.27 -> 1.28) * removal of swig generated bindings --------------+ configure.ac | 3 --- 1 file changed, 3 deletions(-) Index: pacman-lib/configure.ac diff -u pacman-lib/configure.ac:1.27 pacman-lib/configure.ac:1.28 --- pacman-lib/configure.ac:1.27 Thu Feb 1 14:47:39 2007 +++ pacman-lib/configure.ac Thu Feb 1 14:50:07 2007 @@ -276,9 +276,6 @@ etc/pacman.d/Makefile etc/pacman.d/mirrorlist etc/abs/Makefile -bindings/perl/Makefile -bindings/python/Makefile -bindings/java/Makefile Makefile ])

1 0

[pacman-dev] CVS update of pacman-lib (9 files)
by Juergen Hoetzel 01 Feb '07

01 Feb '07

Date: Thursday, February 1, 2007 @ 14:47:40 Author: juergen Path: /home/cvs-pacman/pacman-lib Modified: Makefile.am (1.8 -> 1.9) configure.ac (1.26 -> 1.27) Removed: bindings/alpm.i (1.4) bindings/java/.cvsignore (1.1) bindings/java/Makefile.in (1.3) bindings/perl/.cvsignore (1.1) bindings/perl/Makefile.in (1.3) bindings/python/.cvsignore (1.1) bindings/python/Makefile.in (1.4) * removal of swig generated bindings -----------------------------+ Makefile.am | 10 ----- bindings/alpm.i | 23 ------------ bindings/java/.cvsignore | 5 -- bindings/java/Makefile.in | 48 ------------------------- bindings/perl/.cvsignore | 5 -- bindings/perl/Makefile.in | 42 ---------------------- bindings/python/.cvsignore | 6 --- bindings/python/Makefile.in | 49 -------------------------- configure.ac | 79 ------------------------------------------ 9 files changed, 267 deletions(-) Index: pacman-lib/Makefile.am diff -u pacman-lib/Makefile.am:1.8 pacman-lib/Makefile.am:1.9 --- pacman-lib/Makefile.am:1.8 Tue Nov 14 02:58:42 2006 +++ pacman-lib/Makefile.am Thu Feb 1 14:47:39 2007 @@ -1,15 +1,5 @@ SUBDIRS = lib/libalpm src/util src/pacman scripts doc doc/hu etc -if HAS_PERL -SUBDIRS += bindings/perl -endif -if HAS_PYTHON -SUBDIRS += bindings/python -endif -if HAS_JAVA -SUBDIRS += bindings/java -endif - EXTRA_DIST = \ ChangeLog \ COPYING \ Index: pacman-lib/bindings/alpm.i diff -u pacman-lib/bindings/alpm.i:1.4 pacman-lib/bindings/alpm.i:removed --- pacman-lib/bindings/alpm.i:1.4 Fri Jan 19 04:28:44 2007 +++ pacman-lib/bindings/alpm.i Thu Feb 1 14:47:41 2007 @@ -1,23 +0,0 @@ -#if defined(SWIGPERL) -%module "Alpm::Core" -#else -%module alpm -#endif -%include "cpointer.i" - -/* Wrap a class interface around a "long *" */ -%pointer_class(long, longp); - -/* Create casting functions */ - -%pointer_cast(void *, long *, void_to_long); -%pointer_cast(void *, char *, void_to_char); -%pointer_cast(void *, unsigned long, void_to_unsigned_long); -%pointer_cast(void *, alpm_list_t *, void_to_pmlist); -%pointer_cast(void *, pmpkg_t *, void_to_pmpkg); -%pointer_cast(void *, pmgrp_t *, void_to_pmgrp); -%pointer_cast(void *, pmsyncpkg_t *, void_to_pmsyncpkg); -%pointer_cast(void *, pmdb_t *, void_to_pmdb); -%pointer_cast(void *, pmconflict_t *, void_to_pmconflict); - -%include "alpm.h" Index: pacman-lib/bindings/java/.cvsignore diff -u pacman-lib/bindings/java/.cvsignore:1.1 pacman-lib/bindings/java/.cvsignore:removed --- pacman-lib/bindings/java/.cvsignore:1.1 Tue Jan 16 22:40:08 2007 +++ pacman-lib/bindings/java/.cvsignore Thu Feb 1 14:47:41 2007 @@ -1,5 +0,0 @@ -Makefile -*.class -*.java -alpm.i -*alpm* Index: pacman-lib/bindings/java/Makefile.in diff -u pacman-lib/bindings/java/Makefile.in:1.3 pacman-lib/bindings/java/Makefile.in:removed --- pacman-lib/bindings/java/Makefile.in:1.3 Wed Oct 25 11:40:44 2006 +++ pacman-lib/bindings/java/Makefile.in Thu Feb 1 14:47:41 2007 @@ -1,48 +0,0 @@ -top_srcdir = @top_srcdir@ -prefix = @prefix@ - -CFLAGS = $(subst -Werror,,@CFLAGS@) -I$(JAVA_HOME)/include/ -I$(JAVA_HOME)/include/linux/ -CFLAGS += -fno-strict-aliasing # see the swig docs -ifeq ($(shell arch),x86_64) -CFLAGS += -fPIC -endif -LDFLAGS += -L$(top_srcdir)/lib/libalpm/.libs -lalpm - -all: libalpm_java.so alpm.jar - -libalpm_java.so: alpm_java_wrap.o - $(CC) -shared $^ -o $@ $(LDFLAGS) - -alpm_java_wrap.o: alpm_java_wrap.c - $(CC) $(CFLAGS) -c -o $@ -include alpm.h $^ - -alpm_java_wrap.c: - cp $(top_srcdir)/lib/libalpm/alpm.h ./ - cp $(top_srcdir)/bindings/alpm.i alpm_java.i - swig -java alpm_java.i - -alpm.class: alpm.java - javac *.java - -alpm.jar: alpm.class - jar -cf alpm.jar *.class - -alpm.java: alpm_java_wrap.c - -install: install-so install-jar - -install-so: libalpm_java.so - mkdir -p $(DESTDIR)$(prefix)/lib - install $^ $(DESTDIR)$(prefix)/lib - -install-jar: alpm.jar - mkdir -p $(DESTDIR)$(prefix)/share/java - install -m644 $^ $(DESTDIR)$(prefix)/share/java - -clean: - rm -f *alpm* *.java *.class - -distclean: clean - rm -f Makefile - -check: Index: pacman-lib/bindings/perl/.cvsignore diff -u pacman-lib/bindings/perl/.cvsignore:1.1 pacman-lib/bindings/perl/.cvsignore:removed --- pacman-lib/bindings/perl/.cvsignore:1.1 Tue Jan 16 22:40:08 2007 +++ pacman-lib/bindings/perl/.cvsignore Thu Feb 1 14:47:41 2007 @@ -1,5 +0,0 @@ -Makefile -Core* -alpm.i -alpm.h -alpm_wrap* Index: pacman-lib/bindings/perl/Makefile.in diff -u pacman-lib/bindings/perl/Makefile.in:1.3 pacman-lib/bindings/perl/Makefile.in:removed --- pacman-lib/bindings/perl/Makefile.in:1.3 Thu Jan 18 11:52:57 2007 +++ pacman-lib/bindings/perl/Makefile.in Thu Feb 1 14:47:41 2007 @@ -1,42 +0,0 @@ -top_srcdir = @top_srcdir@ -prefix = @prefix@ - -CFLAGS = $(subst -Werror,,@CFLAGS@) -CFLAGS += $(shell perl -MExtUtils::Embed -e ccopts) -CFLAGS += -I$(top_srcdir)/lib/libalpm -ifeq ($(shell arch),x86_64) -CFLAGS += -fPIC -endif -LDFLAGS += -L$(top_srcdir)/lib/libalpm/.libs -lalpm -LIBDIR += $(shell perl -V|grep site|sed 's/^ *//;s|/usr|$(prefix)|;q') - -all: Core.so - -Core.so: alpm_wrap.o - $(CC) -shared -Wl,-soname,$@ -o $@ $^ $(LDFLAGS) - -alpm_wrap.o: alpm_wrap.c - $(CC) $(CFLAGS) -c -o $@ -include alpm.h $^ - -alpm_wrap.c: - cp $(top_srcdir)/lib/libalpm/alpm.h ./ - cp $(top_srcdir)/bindings/alpm.i ./ - swig -perl alpm.i - -install: install-so install-pm - -install-so: Core.so - mkdir -p $(DESTDIR)$(LIBDIR)/auto/Alpm/Core - install $^ $(DESTDIR)$(LIBDIR)/auto/Alpm/Core/ - -install-pm: Core.pm - mkdir -p $(DESTDIR)$(LIBDIR)/Alpm/ - install -m644 $^ $(DESTDIR)$(LIBDIR)/Alpm/ - -clean: - rm -f Core* alpm{.h,.i,_wrap*} - -distclean: clean - rm -f Makefile - -check: Index: pacman-lib/bindings/python/.cvsignore diff -u pacman-lib/bindings/python/.cvsignore:1.1 pacman-lib/bindings/python/.cvsignore:removed --- pacman-lib/bindings/python/.cvsignore:1.1 Tue Jan 16 22:40:08 2007 +++ pacman-lib/bindings/python/.cvsignore Thu Feb 1 14:47:41 2007 @@ -1,6 +0,0 @@ -Makefile -_alpm* -alpm.i -alpm.h -alpm.py* -alpm_wrap* Index: pacman-lib/bindings/python/Makefile.in diff -u pacman-lib/bindings/python/Makefile.in:1.4 pacman-lib/bindings/python/Makefile.in:removed --- pacman-lib/bindings/python/Makefile.in:1.4 Thu Jan 18 11:52:57 2007 +++ pacman-lib/bindings/python/Makefile.in Thu Feb 1 14:47:41 2007 @@ -1,49 +0,0 @@ -top_srcdir = @top_srcdir@ -prefix = @prefix@ - -CFLAGS = $(subst -Werror,,@CFLAGS@) -CFLAGS += $(shell python -c 'from distutils import sysconfig; print "-I" + sysconfig.get_python_inc()') -CFLAGS += -I$(top_srcdir)/lib/libalpm -CFLAGS += -fno-strict-aliasing # see the swig docs -ifeq ($(shell arch),x86_64) -CFLAGS += -fPIC -endif -LDFLAGS += -L$(top_srcdir)/lib/libalpm/.libs -lalpm -LIBDIR += $(shell python -c 'from distutils import sysconfig; print sysconfig.get_python_lib()'|sed 's|/usr|$(prefix)|') - -all: _alpm.so alpm.pyc - -_alpm.so: alpm_wrap.o - $(CC) -shared -Wl,-soname,$@ -o $@ $^ $(LDFLAGS) - -alpm_wrap.o: alpm_wrap.c - $(CC) $(CFLAGS) -c -o $@ -include alpm.h $^ - -alpm_wrap.c: - cp $(top_srcdir)/lib/libalpm/alpm.h ./ - cp $(top_srcdir)/bindings/alpm.i ./ - swig -python alpm.i - # strip the unnecessary prefixes - sed -i 's/^alpm_//;s/^PM_//' alpm.py - -alpm.pyc: alpm.py - python -c "import compileall; compileall.compile_dir('.',1,'.')" - -alpm.py: alpm_wrap.c - -install: install-so install-py - -install-so: _alpm.so - mkdir -p $(DESTDIR)$(LIBDIR) - install $^ $(DESTDIR)$(LIBDIR) - -install-py: alpm.py alpm.pyc - install -m644 $^ $(DESTDIR)$(LIBDIR) - -clean: - rm -f _alpm* alpm{.h,.i,.py*,_wrap*} - -distclean: clean - rm -f Makefile - -check: Index: pacman-lib/configure.ac diff -u pacman-lib/configure.ac:1.26 pacman-lib/configure.ac:1.27 --- pacman-lib/configure.ac:1.26 Tue Jan 30 15:37:59 2007 +++ pacman-lib/configure.ac Thu Feb 1 14:47:39 2007 @@ -207,82 +207,6 @@ fi AM_CONDITIONAL(HAS_DOXYGEN, test $DOXYGEN) -dnl Check for swig binary -AC_CHECK_PROGS([SWIG], [swig]) - -dnl Check for python support -AC_MSG_CHECKING(if Python bindings should be generated) -if test x$wantpython = xyes ; then - AM_CONDITIONAL(HAS_PYTHON, test $SWIG) - if test $SWIG ; then - AC_DEFINE([HAS_PYTHON], [TRUE], [Enabled Python Support]) - AC_MSG_RESULT(yes) - PYTHONSTATUS="yes, path: `which $SWIG`" - else - AC_DEFINE([HAS_PYTHON], [FALSE], [Disabled Python support]) - AC_MSG_RESULT(no, swig missing) - PYTHONSTATUS="swig binary not found" - fi -else - AM_CONDITIONAL(HAS_PYTHON, test $PYTHON) - AC_DEFINE([HAS_PYTHON], [FALSE], [Not specified at configure line]) - AC_MSG_RESULT(not requested by configure) - PYTHONSTATUS="no, disabled by configure" -fi - -dnl Check for perl support -AC_MSG_CHECKING(if Perl bindings should be generated) -if test x$wantperl = xyes ; then - AM_CONDITIONAL(HAS_PERL, test $SWIG) - if test $SWIG ; then - AC_DEFINE([HAS_PERL], [TRUE], [Enabled Perl Support]) - AC_MSG_RESULT(yes) - PERLSTATUS="yes, path: `which $SWIG`" - else - AC_DEFINE([HAS_PERL], [FALSE], [Disabled Perl support]) - AC_MSG_RESULT(no, swig missing) - PERLSTATUS="swig binary not found" - fi -else - AM_CONDITIONAL(HAS_PERL, test $PERL) - AC_DEFINE([HAS_PERL], [FALSE], [Not specified at configure line]) - AC_MSG_RESULT(not requested by configure) - PERLSTATUS="no, disabled by configure" -fi - -dnl Check for java support -AC_MSG_CHECKING(if Java bindings should be generated) -if test x$wantjava = xyes ; then - AC_CHECK_PROGS([JAVAC], [javac]) - AM_CONDITIONAL(HAS_JAVA, test "$JAVAC" -a "$SWIG") - if test $JAVAC ; then - if test $SWIG ; then - AC_DEFINE([HAS_JAVA], [TRUE], [Enabled Java Support (javac=ok swig=ok)]) - AC_MSG_RESULT(yes) - JAVASTATUS="yes, path: `which $JAVAC`" - else - AC_DEFINE([HAS_JAVA], [FALSE], [Java support disabled because swig not found (javac=ok swig=missing)]) - AC_MSG_RESULT(no, swig not found and that is need for java) - JAVASTATUS="java compiler found, swig not found" - fi - else - if test $SWIG ; then - AC_DEFINE([HAS_JAVA], [FALSE], [Disabled Java support (javac=missing swig=ok]) - AC_MSG_RESULT(no, javac missing, swig ok) - JAVASTATUS="java compiler not found, swig found" - else - AC_DEFINE([HAS_JAVA], [FALSE], [Disabled Java support (javac=missing swig=missing]) - AC_MSG_RESULT(no, javac missing, swig missing) - JAVASTATUS="java compiler not found, swig not found" - fi - fi -else - AM_CONDITIONAL(HAS_JAVA, test $JAVAC -a $SWIG) - AC_DEFINE([HAS_JAVA], [FALSE], [Not specified at configure line]) - AC_MSG_RESULT(not requested by configure) - JAVASTATUS="no, disabled by configure" -fi - dnl Check for math AC_CHECK_LIB([m], [sqrt], [AC_CHECK_HEADER([math.h], [LIBM='-lm'])]) if test -z "$LIBM"; then @@ -375,9 +299,6 @@ Doxygen support : ${DOXYSTATUS} Manpage localization : ${POSTATUS} - Perl bindings : ${PERLSTATUS} - Python bindings : ${PYTHONSTATUS} - Java bindings : ${JAVASTATUS} debug support : ${debug} "

1 0

[pacman-dev] CVS update of pacman-lib/src/pacman (5 files)
by dan＠archlinux.org 01 Feb '07

01 Feb '07

Date: Thursday, February 1, 2007 @ 01:35:30 Author: dan Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: add.c (1.27 -> 1.28) remove.c (1.27 -> 1.28) sync.c (1.105 -> 1.106) util.c (1.24 -> 1.25) util.h (1.13 -> 1.14) * Tried to clean up newline display a bit in the frontend. * Removed useless buildstring function from util.h; replaced all calls of it with list_display. * Made list_display output 2 spaces instead of 1 between each item. ----------+ add.c | 3 ++- remove.c | 3 ++- sync.c | 14 +++++--------- util.c | 32 +++----------------------------- util.h | 1 - 5 files changed, 12 insertions(+), 41 deletions(-) Index: pacman-lib/src/pacman/add.c diff -u pacman-lib/src/pacman/add.c:1.27 pacman-lib/src/pacman/add.c:1.28 --- pacman-lib/src/pacman/add.c:1.27 Wed Jan 31 01:10:22 2007 +++ pacman-lib/src/pacman/add.c Thu Feb 1 01:35:30 2007 @@ -76,12 +76,13 @@ MSG(NL, _("loading package data... ")); for(i = targets; i; i = i->next) { if(alpm_trans_addtarget(i->data) == -1) { + MSG(NL, "\n"); ERR(NL, _("failed to add target '%s' (%s)\n"), (char *)i->data, alpm_strerror(pm_errno)); retval = 1; goto cleanup; } } - MSG(CL, _("done.")); + MSG(CL, _("done.\n")); /* Step 2: "compute" the transaction based on targets and flags */ Index: pacman-lib/src/pacman/remove.c diff -u pacman-lib/src/pacman/remove.c:1.27 pacman-lib/src/pacman/remove.c:1.28 --- pacman-lib/src/pacman/remove.c:1.27 Wed Jan 31 01:10:22 2007 +++ pacman-lib/src/pacman/remove.c Thu Feb 1 01:35:30 2007 @@ -121,7 +121,8 @@ pmpkg_t *pkg = alpm_list_getdata(i); lst = alpm_list_add(lst, strdup(alpm_pkg_get_name(pkg))); } - list_display(_("\nTargets:"), lst); + MSG(NL, "\n"); + list_display(_("Targets:"), lst); FREELIST(lst); /* get confirmation */ if(yesno(_("\nDo you want to remove these packages? [Y/n] ")) == 0) { Index: pacman-lib/src/pacman/sync.c diff -u pacman-lib/src/pacman/sync.c:1.105 pacman-lib/src/pacman/sync.c:1.106 --- pacman-lib/src/pacman/sync.c:1.105 Wed Jan 31 03:30:15 2007 +++ pacman-lib/src/pacman/sync.c Thu Feb 1 01:35:30 2007 @@ -292,6 +292,7 @@ pmgrp_t *grp = alpm_db_readgrp(db, grpname); if(grp) { + /* TODO this should be a lot cleaner, why two outputs? */ MSG(NL, "%s\n", (char *)alpm_grp_get_name(grp)); list_display(" ", alpm_grp_get_packages(grp)); } @@ -659,12 +660,9 @@ list_install = alpm_list_add(list_install, str); } if(list_remove) { - MSG(NL, _("\nRemove: ")); - str = buildstring(list_remove); - indentprint(str, 9); - MSG(CL, "\n"); + MSG(NL, "\n"); /* TODO ugly hack. printing a single NL should be easy */ + list_display(_("Remove:"), list_remove); FREELIST(list_remove); - FREE(str); } mb = (double)(totalsize / 1048576.0); umb = (double)(totalisize / 1048576.0); @@ -675,15 +673,13 @@ if(umb > 0 && umb < 0.1) { umb = 0.1; } - MSG(NL, _("\nTargets: ")); - str = buildstring(list_install); - indentprint(str, 9); + MSG(NL, "\n"); + list_display(_("Targets:"), list_install); MSG(NL, _("\nTotal Package Size: %.1f MB\n"), mb); if(umb > 0) { MSG(NL, _("Total Installed Size: %.1f MB\n"), umb); } FREELIST(list_install); - FREE(str); if(config->op_s_downloadonly) { if(config->noconfirm) { Index: pacman-lib/src/pacman/util.c diff -u pacman-lib/src/pacman/util.c:1.24 pacman-lib/src/pacman/util.c:1.25 --- pacman-lib/src/pacman/util.c:1.24 Thu Jan 25 21:13:16 2007 +++ pacman-lib/src/pacman/util.c Thu Feb 1 01:35:30 2007 @@ -194,32 +194,6 @@ } } -/* Condense a list of strings into one long (space-delimited) string - */ -char *buildstring(alpm_list_t *strlist) -{ - char *str; - size_t size = 1; - alpm_list_t *i; - - for(i = strlist; i; i = alpm_list_next(i)) { - size += strlen(alpm_list_getdata(i)) + 1; - } - str = (char *)malloc(size); - if(str == NULL) { - ERR(NL, _("failed to allocate %d bytes\n"), size); - } - str[0] = '\0'; - for(i = strlist; i; i = alpm_list_next(i)) { - strcat(str, alpm_list_getdata(i)); - strcat(str, " "); - } - /* shave off the last space */ - str[strlen(str)-1] = '\0'; - - return(str); -} - /* Convert a string to uppercase */ char *strtoupper(char *str) @@ -265,17 +239,17 @@ if(list) { for(i = list, cols = len; i; i = alpm_list_next(i)) { char *str = alpm_list_getdata(i); - int s = strlen(str)+1; + int s = strlen(str) + 2; unsigned int maxcols = getcols(); if(s + cols >= maxcols) { int i; cols = len; printf("\n"); - for (i = 0; i < len+1; ++i) { + for (i = 0; i <= len; ++i) { printf(" "); } } - printf("%s ", str); + printf("%s ", str); cols += s; } printf("\n"); Index: pacman-lib/src/pacman/util.h diff -u pacman-lib/src/pacman/util.h:1.13 pacman-lib/src/pacman/util.h:1.14 --- pacman-lib/src/pacman/util.h:1.13 Fri Jan 19 04:28:47 2007 +++ pacman-lib/src/pacman/util.h Thu Feb 1 01:35:30 2007 @@ -52,7 +52,6 @@ int makepath(char *path); int rmrf(char *path); void indentprint(const char *str, unsigned int indent); -char *buildstring(alpm_list_t *strlist); char *strtoupper(char *str); char *strtrim(char *str); int reg_match(char *string, char *pattern);

1 0

[pacman-dev] CVS update of pacman-lib/etc/pacman.d (mirrorlist.in)
by dan＠archlinux.org 01 Feb '07

01 Feb '07

Date: Wednesday, January 31, 2007 @ 23:12:58 Author: dan Path: /home/cvs-pacman/pacman-lib/etc/pacman.d Modified: mirrorlist.in (1.2 -> 1.3) Added mirror in Finland to mirrorlist ---------------+ mirrorlist.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: pacman-lib/etc/pacman.d/mirrorlist.in diff -u pacman-lib/etc/pacman.d/mirrorlist.in:1.2 pacman-lib/etc/pacman.d/mirrorlist.in:1.3 --- pacman-lib/etc/pacman.d/mirrorlist.in:1.2 Thu Dec 28 12:13:12 2006 +++ pacman-lib/etc/pacman.d/mirrorlist.in Wed Jan 31 23:12:58 2007 @@ -19,12 +19,13 @@ Server = ftp://ftp.sh.cvut.cz/MIRRORS/arch/@@REPO@@/os/@CARCH@ # - Estonia Server = ftp://ftp.estpak.ee/pub/archlinux/@@REPO@@/os/@CARCH@ +# - Finland +Server = ftp://ftp.sixnix.net/pub/archlinux/@@REPO@@/os/@CARCH@ # - France Server = ftp://ftp.rez-gif.supelec.fr/pub/Linux/distrib/archlinux/@@REPO@@/os/@CARCH@ Server = ftp://mir1.archlinuxfr.org/archlinux/@@REPO@@/os/@CARCH@ Server = ftp://mir2.archlinuxfr.org/archlinux/@@REPO@@/os/@CARCH@ Server = ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/archlinux/@@REPO@@/os/@CARCH@ -#Server = http://mirrors.jakimowicz.com/archlinux/@@REPO@@/os/@CARCH@ # - Germany Server = ftp://ftp.tu-chemnitz.de/pub/linux/sunsite.unc-mirror/distributions/archlinux/@@REPO@@/os/@CARCH@ Server = ftp://ftp.hosteurope.de/mirror/ftp.archlinux.org/@@REPO@@/os/@CARCH@

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (server.c sync.c)
by Aaron Griffin 01 Feb '07

01 Feb '07

Date: Wednesday, January 31, 2007 @ 22:31:47 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: server.c (1.18 -> 1.19) sync.c (1.96 -> 1.97) * Minor output fix (move colon so it's not part of the URL) * Added ldconfig on --sync operations too ----------+ server.c | 2 +- sync.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) Index: pacman-lib/lib/libalpm/server.c diff -u pacman-lib/lib/libalpm/server.c:1.18 pacman-lib/lib/libalpm/server.c:1.19 --- pacman-lib/lib/libalpm/server.c:1.18 Tue Jan 30 03:14:11 2007 +++ pacman-lib/lib/libalpm/server.c Wed Jan 31 22:31:46 2007 @@ -187,7 +187,7 @@ } if(downloadLastErrCode != 0 || dlf == NULL) { - _alpm_log(PM_LOG_ERROR, _("failed retrieving file '%s' from %s://%s: %s"), fn, + _alpm_log(PM_LOG_ERROR, _("failed retrieving file '%s' from %s://%s : %s"), fn, server->s_url->scheme, server->s_url->host, downloadLastErrString); if(localf != NULL) { fclose(localf); Index: pacman-lib/lib/libalpm/sync.c diff -u pacman-lib/lib/libalpm/sync.c:1.96 pacman-lib/lib/libalpm/sync.c:1.97 --- pacman-lib/lib/libalpm/sync.c:1.96 Wed Jan 31 01:10:21 2007 +++ pacman-lib/lib/libalpm/sync.c Wed Jan 31 22:31:46 2007 @@ -1079,6 +1079,13 @@ unlink(i->data); } } + + /* run ldconfig if it exists */ + if(handle->trans->state != STATE_INTERRUPTED) { + _alpm_log(PM_LOG_DEBUG, _("running \"ldconfig -r %s\""), handle->root); + _alpm_ldconfig(handle->root); + } + return(0); error:

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (package.c)
by Aaron Griffin 01 Feb '07

01 Feb '07

Date: Wednesday, January 31, 2007 @ 22:00:35 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: package.c (1.54 -> 1.55) Loading package data from a file was ALWAYS generating the filelist, instead of using the in-package one. This is now fixed, and an autogenerated one is used as a last resort. This fixes the bug where /.CHANGELOG showed up in -Ql. -----------+ package.c | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.54 pacman-lib/lib/libalpm/package.c:1.55 --- pacman-lib/lib/libalpm/package.c:1.54 Wed Jan 31 20:51:12 2007 +++ pacman-lib/lib/libalpm/package.c Wed Jan 31 22:00:34 2007 @@ -241,11 +241,12 @@ int config = 0; int filelist = 0; int scriptcheck = 0; - register struct archive *archive; + struct archive *archive; struct archive_entry *entry; pmpkg_t *info = NULL; char *descfile = NULL; int fd = -1; + alpm_list_t *all_files = NULL; ALPM_LOG_FUNC; @@ -272,11 +273,14 @@ * from a libarchive archive, it can be done by reading * directly from the archive */ for(i = 0; archive_read_next_header (archive, &entry) == ARCHIVE_OK; i++) { + const char *entry_name = archive_entry_pathname(entry); + if(config && filelist && scriptcheck) { /* we have everything we need */ break; } - if(strcmp(archive_entry_pathname (entry), ".PKGINFO") == 0) { + + if(strcmp(entry_name, ".PKGINFO") == 0) { /* extract this file into /tmp. it has info for us */ descfile = strdup("/tmp/alpm_XXXXXX"); fd = mkstemp(descfile); @@ -299,10 +303,10 @@ FREE(descfile); close(fd); continue; - } else if(strcmp(archive_entry_pathname (entry), ".INSTALL") == 0) { + } else if(strcmp(entry_name, ".INSTALL") == 0) { info->scriptlet = 1; scriptcheck = 1; - } else if(strcmp(archive_entry_pathname (entry), ".FILELIST") == 0) { + } else if(strcmp(entry_name, ".FILELIST") == 0) { /* Build info->files from the filelist */ FILE *fp; char *fn; @@ -314,7 +318,7 @@ } fn = strdup("/tmp/alpm_XXXXXX"); fd = mkstemp(fn); - archive_read_data_into_fd (archive,fd); + archive_read_data_into_fd(archive,fd); fp = fopen(fn, "r"); while(!feof(fp)) { if(fgets(str, PATH_MAX, fp) == NULL) { @@ -334,28 +338,29 @@ continue; } else { scriptcheck = 1; - if(!filelist) { - /* no .FILELIST present in this package.. build the filelist the */ - /* old-fashioned way, one at a time */ - expath = strdup(archive_entry_pathname (entry)); - info->files = alpm_list_add(info->files, expath); - } + /* Keep track of all files so we can generate a filelist later if missing */ + all_files = alpm_list_add(all_files, strdup(entry_name)); } - if(archive_read_data_skip (archive)) { + if(archive_read_data_skip(archive)) { _alpm_log(PM_LOG_ERROR, _("bad package file in %s"), pkgfile); goto error; } expath = NULL; } - archive_read_finish (archive); + archive_read_finish(archive); if(!config) { _alpm_log(PM_LOG_ERROR, _("missing package info file in %s"), pkgfile); goto error; - } else if(!filelist) { - _alpm_log(PM_LOG_ERROR, _("missing package filelist in %s"), pkgfile); - goto error; + } + + if(!filelist) { + _alpm_log(PM_LOG_ERROR, _("missing package filelist in %s, generating one"), pkgfile); + info->files = all_files; + } else { + alpm_list_free_inner(all_files, free); + alpm_list_free(all_files); } /* internal */ @@ -376,7 +381,7 @@ } error: FREEPKG(info); - archive_read_finish (archive); + archive_read_finish(archive); return(NULL); }

1 0

[pacman-dev] CVS update of pacman-lib/scripts (makepkg)
by Aaron Griffin 01 Feb '07

01 Feb '07

Date: Wednesday, January 31, 2007 @ 21:34:03 Author: aaron Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.39 -> 1.40) It appears I misunderstood what this bash-ism did ---------+ makepkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.39 pacman-lib/scripts/makepkg:1.40 --- pacman-lib/scripts/makepkg:1.39 Wed Jan 31 21:12:49 2007 +++ pacman-lib/scripts/makepkg Wed Jan 31 21:34:03 2007 @@ -927,7 +927,7 @@ cd "$startdir/pkg" pkg_file="$PKGDEST/$pkgname-$pkgver-$pkgrel-${CARCH}.${PKGEXT}" -comp_files=".PKGINFO .FILELIST .INSTALL" +comp_files=".PKGINFO .FILELIST ${install:+.INSTALL}" [ $have_changelog -eq 1 ] && comp_files=".CHANGELOG $comp_files" if ! tar czf $pkg_file $comp_files *; then

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (add.c)
by Aaron Griffin 01 Feb '07

01 Feb '07

Date: Wednesday, January 31, 2007 @ 21:29:07 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: add.c (1.109 -> 1.110) Cleaned up some of the metadata control -------+ add.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) Index: pacman-lib/lib/libalpm/add.c diff -u pacman-lib/lib/libalpm/add.c:1.109 pacman-lib/lib/libalpm/add.c:1.110 --- pacman-lib/lib/libalpm/add.c:1.109 Wed Jan 31 01:10:21 2007 +++ pacman-lib/lib/libalpm/add.c Wed Jan 31 21:29:07 2007 @@ -504,25 +504,17 @@ PROGRESS(trans, cb_state, what, (int)(percent * 100), alpm_list_count(trans->packages), (alpm_list_count(trans->packages) - alpm_list_count(targ) +1)); } - if(!strcmp(pathname, ".PKGINFO") || !strcmp(pathname, ".FILELIST")) { + if(strcmp(pathname, ".PKGINFO") == 0 || strcmp(pathname, ".FILELIST") == 0) { archive_read_data_skip (archive); continue; - } - - /*if(!strcmp(pathname, "._install") || !strcmp(pathname, ".INSTALL")) { - * the install script goes inside the db - * snprintf(expath, PATH_MAX, "%s/%s-%s/install", db->path, info->name, info->version); */ - if(!strcmp(pathname, "._install") || !strcmp(pathname, ".INSTALL") || - !strcmp(pathname, ".CHANGELOG")) { - if(!strcmp(pathname, ".CHANGELOG")) { - /* the changelog goes inside the db */ - snprintf(expath, PATH_MAX, "%s/%s-%s/changelog", db->path, - info->name, info->version); - } else { - /* the install script goes inside the db */ - snprintf(expath, PATH_MAX, "%s/%s-%s/install", db->path, - info->name, info->version); - } + } else if(strcmp(pathname, ".INSTALL") == 0) { + /* the install script goes inside the db */ + snprintf(expath, PATH_MAX, "%s/%s-%s/install", db->path, + info->name, info->version); + } else if(strcmp(pathname, ".CHANGELOG") == 0) { + /* the changelog goes inside the db */ + snprintf(expath, PATH_MAX, "%s/%s-%s/changelog", db->path, + info->name, info->version); } else { /* build the new pathname relative to handle->root */ snprintf(expath, PATH_MAX, "%s%s", handle->root, pathname);

1 0

[pacman-dev] CVS update of pacman-lib/src/pacman (package.c)
by Aaron Griffin 01 Feb '07

01 Feb '07

Date: Wednesday, January 31, 2007 @ 21:16:14 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: package.c (1.25 -> 1.26) -Ql needs the 'root' prepended to each file -----------+ package.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: pacman-lib/src/pacman/package.c diff -u pacman-lib/src/pacman/package.c:1.25 pacman-lib/src/pacman/package.c:1.26 --- pacman-lib/src/pacman/package.c:1.25 Mon Jan 29 23:15:14 2007 +++ pacman-lib/src/pacman/package.c Wed Jan 31 21:16:13 2007 @@ -203,7 +203,8 @@ pkgfiles = alpm_pkg_get_files(pkg); for(i = pkgfiles; i; i = alpm_list_next(i)) { - fprintf(stdout, "%s %s\n", (char *)pkgname, (char *)alpm_list_getdata(i)); + fprintf(stdout, "%s %s%s\n", pkgname, alpm_option_get_root(), + (char *)alpm_list_getdata(i)); } fflush(stdout);

1 0

[pacman-dev] CVS update of pacman-lib/scripts (makepkg)
by dan＠archlinux.org 01 Feb '07

01 Feb '07

Date: Wednesday, January 31, 2007 @ 21:12:49 Author: dan Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.38 -> 1.39) This removes the warning about skipping dependency checking when the user is either generating the md5sums, repackaging, or just downloading and extracting. The patch is below. ~ Jamie / yankees26 Signed-off-by: James Rosten <seinfeld90(a)gmail.com> ---------+ makepkg | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.38 pacman-lib/scripts/makepkg:1.39 --- pacman-lib/scripts/makepkg:1.38 Wed Jan 31 21:02:45 2007 +++ pacman-lib/scripts/makepkg Wed Jan 31 21:12:49 2007 @@ -524,7 +524,10 @@ unset deplist makedeplist # fix flyspray bug #5973 if [ "$NODEPS" = "1" -o "$GENINTEG" = "1" -o "$NOBUILD" = "1" -o "$REPKG" = "1" ]; then - warning "skipping dependency checks" + if [ "$NODEPS" = "1" ]; then + warning "skipping dependency checks" + fi + # skip printing a warning message for the others: geninteg, nobuild, repkg elif [ $(type -p pacman) ]; then msg "Checking Runtime Dependencies..." deplist=$(checkdeps ${depends[@]})

1 0