- Pacman-dev - lists.archlinux.org

[pacman-dev] CVS update of pacman-lib/scripts (makepkg)
by Juergen Hoetzel 13 Feb '07

13 Feb '07

Date: Tuesday, February 13, 2007 @ 15:47:34 Author: juergen Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.48 -> 1.49) * unset LC_ALL, LANG after sourcing /etc/profile.d/* ---------+ makepkg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.48 pacman-lib/scripts/makepkg:1.49 --- pacman-lib/scripts/makepkg:1.48 Sun Feb 11 16:47:37 2007 +++ pacman-lib/scripts/makepkg Tue Feb 13 15:47:34 2007 @@ -503,10 +503,6 @@ unset replaces depends conflicts backup source install build makedepends unset options noextract -# some applications (eg, blackbox) will not build with some languages -unset LC_ALL LANG -umask 0022 - if [ ! -f $BUILDSCRIPT ]; then error "$BUILDSCRIPT does not exist." exit 1 @@ -830,6 +826,10 @@ # build msg "Starting build()..." + # some applications (eg, blackbox) will not build with some languages + unset LC_ALL LANG + umask 0022 + #check for "exit on syntax error" shell option echo $SHELLOPTS | grep errexit 2>&1 >/dev/null set_e=$?

1 0

[pacman-dev] x86_64 experiences
by Andreas Radke 13 Feb '07

13 Feb '07

Here are the changes I had to add to the latest PKGBUILD (12022007) to make it build the way I want to have it: sed -i "s|k8|x86_64|g" configure.ac sed -i "s|i686|x86_64|g" etc/pacman.conf.in before ./autogen.sh and at the end of the build section: sed -i 21d $startdir/pkg/etc/makepkg3.conf sed -i 23,25d $startdir/pkg/etc/makepkg3.conf sed -i "s|CURRENT|CURRENT-64|g" $startdir/pkg/etc/abs3/supfile.arch sed -i "s|CURRENT|CURRENT-64|g" $startdir/pkg/etc/abs3/supfile.extra sed -i "s|CURRENT|CURRENT-64|g" $startdir/pkg/etc/abs3/supfile.community sed -i "s|TESTING|TESTING-64|g" $startdir/pkg/etc/abs3/supfile.testing sed -i "s|CURRENT|CURRENT-64|g" $startdir/pkg/etc/abs3/supfile.unstable Maybe we can do this in a better way. Especially the CARCH that goes into /etc/makepkg.conf should not be autodetected in such a way. I suggest to use a configure switch or a special export "wanted CARCH" before the build starts and that should go into makepkg.conf I guess you can easily fix those issues. Now to the bad part: Nothing happens :( [root@workstation64 andyrtr]# pacman3 -Syu :: Synchronisiere Paketdatenbank ... current 70,7K 33,9K/s 00:00:02 [##################################################################################################] 100% extra 252,7K 31,1K/s 00:00:08 [##################################################################################################] 100% community 24,0K 29,5K/s 00:00:01 [##################################################################################################] 100% :: Starting full system upgrade... Warnung: k3b: local (0.12.17-2.1) is newer than extra (0.12.17-2) Warnung: kernel26: local (2.6.20-2) is newer than current (2.6.19.2-1) Warnung: nvidia: local (1.0.9746-1) is newer than extra (1.0.9631-1) Warnung: nvidia-utils: local (1.0.9746-1) is newer than extra (1.0.9631-1) Löse Abhängigkeiten auf ... beendet. looking for inter-conflicts... beendet. Pakete: jre-6-2 azureus-2.5.0.4-1 dbus-1.0.2-4 dbus-glib-0.72-2 gnome-icon-theme-2.17.91-1 evince-0.7.2-1 kdelibs-3.5.6-4 kdepim-3.5.6-3 libgtop-2.14.7-1 libmatroska-0.8.1-1 mktemp-1.5-1.2 nx-common-2.1.0-2 nxserver-2.1.0-2 p7zip-4.44-1 spidermonkey-1.60-1 vlc-0.8.6a-3 Total Package Size: 95,25 MB Proceed with installation? [Y/n] y [root@workstation64 andyrtr]# How to debug that? In other parts it works well. [root@workstation64 andyrtr]# pacman3 -U /home/daten/arch64/packages/testing/pacman-rc-2007.02.12-2.pkg.tar.gz Lade Paketdaten ... beendet. Prüfe Abhängigkeiten ... beendet. cleaning up... beendet. (1/1) checking for file conflicts [##################################################################################################] 100% Warnung: /etc/makepkg3.conf installiert als /etc/makepkg3.conf.pacnew (1/1) aktualisiere pacman-rc [##################################################################################################] 100% [root@workstation64 andyrtr]# pacman3 -U /home/daten/arch64/packages/testing/pacman-rc-2007.02.12-1.pkg.tar.gz Lade Paketdaten ... beendet. Prüfe Abhängigkeiten ... beendet. cleaning up... beendet. (1/1) checking for file conflicts [##################################################################################################] 100% Warnung: /etc/makepkg3.conf installiert als /etc/makepkg3.conf.pacnew (1/1) aktualisiere pacman-rc [##################################################################################################] 100% [root@workstation64 andyrtr]# btw: i don't like the localisation. can u add a switch in pacman.conf to disable that behavior? Andy

4 8

[pacman-dev] CVS update of pacman-lib/etc (makepkg.conf.in)
by Aaron Griffin 13 Feb '07

13 Feb '07

Date: Tuesday, February 13, 2007 @ 14:02:35 Author: aaron Path: /home/cvs-pacman/pacman-lib/etc Modified: makepkg.conf.in (1.13 -> 1.14) >From Phil Dillon-Thiselton <dibblethewrecker(a)gmail.com>: * Wording error in makepkg.conf -----------------+ makepkg.conf.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: pacman-lib/etc/makepkg.conf.in diff -u pacman-lib/etc/makepkg.conf.in:1.13 pacman-lib/etc/makepkg.conf.in:1.14 --- pacman-lib/etc/makepkg.conf.in:1.13 Mon Feb 12 20:25:26 2007 +++ pacman-lib/etc/makepkg.conf.in Tue Feb 13 14:02:35 2007 @@ -52,8 +52,8 @@ # #-- strip: Strip symbols from binaries/libraries #-- docs: Save doc and info directories -#-- libtool: Leave libtool (.la) files in binaries -#-- emptydirs: Leave empty directories in binaries +#-- libtool: Leave libtool (.la) files in packages +#-- emptydirs: Leave empty directories in packages # OPTIONS=(strip !docs libtool emptydirs)

1 0

[pacman-dev] Deadline for translations?
by Pierre Schmitz 13 Feb '07

13 Feb '07

Hi, are there any deadlines for translations? I think it would be usefull to include our translation into the first public test version. (is it still planed for 14.2?) Pierre

4 12

[pacman-dev] different behavior for replaces/conflicts
by Andreas Radke 13 Feb '07

13 Feb '07

i've made a dvbcut-svn pkg that has conflicts=('dvbcut') replaces=('dvbcut') pacman (2) can handle this well but pacman3 fails: [root@workstation64 andyrtr]# pacman3 -U /home/daten/arch64/packages/testing/dvbcut-svn-20070213-1.pkg.tar.gz Lade Paketdaten ... beendet. Prüfe Abhängigkeiten ... :: dvbcut-svn steht im Konflikt mit dvbcut. dvbcut entfernen? [J/n] j beendet. cleaning up... beendet. (1/1) checking for file conflicts [##################################################################################################] 100% error: Konnte Durchführung nicht vorbereiten (conflicting files) dvbcut-svn: /usr/bin/dvbcut exists in filesystem Fehler aufgetreten, kein Paket wird aktualisiert. [root@workstation64 andyrtr]# pacman -U /home/daten/arch64/packages/testing/dvbcut-svn-20070213-1.pkg.tar.gz loading package data... done. :: dvbcut-svn conflicts with dvbcut. Remove dvbcut? [Y/n] y removing dvbcut... done. checking for file conflicts... done. installing dvbcut-svn... done. >>> dvbcut can give you a video preview. >>> >>> just install mplayer to have this further >>> feature. pure cutting won´t need it. [root@workstation64 andyrtr]# Andy

3 2

[pacman-dev] Another large commit
by Aaron Griffin 13 Feb '07

13 Feb '07

This was blocked due to some line # changes in the po files... so it got real messy, even though this was a small commit. Date: Tuesday, February 13, 2007 @ 03:15:39 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: lib/libalpm/alpm_list.h (1.3 -> 1.4) lib/libalpm/conflict.c (1.34 -> 1.35) lib/libalpm/package.c (1.67 -> 1.68) lib/libalpm/po/de.po (1.2 -> 1.3) lib/libalpm/po/fr.po (1.2 -> 1.3) lib/libalpm/po/hu.po (1.2 -> 1.3) lib/libalpm/po/it.po (1.1 -> 1.2) lib/libalpm/po/pt_BR.po (1.1 -> 1.2) lib/libalpm/remove.c (1.62 -> 1.63) lib/libalpm/sync.c (1.100 -> 1.101) lib/libalpm/util.c (1.44 -> 1.45) lib/libalpm/util.h (1.20 -> 1.21) src/pacman/po/de.po (1.2 -> 1.3) src/pacman/po/fr.po (1.2 -> 1.3) src/pacman/po/hu.po (1.2 -> 1.3) src/pacman/po/it.po (1.1 -> 1.2) src/pacman/po/pt_BR.po (1.1 -> 1.2) * Refactored conflict checking within packages. Profiling from Dan showed an unbelievable amount of strcmp() calls (25 million) due to the list searching. This has been reimplemented with a set-intersection scheme, due to the fact that file lists are always ordered. - NEEDS TESTING * Minor clean up, "globalized" the str_cmp helper to match the alpm comparison signature, so we can use it elsewhere. -------------------------+ lib/libalpm/alpm_list.h | 6 lib/libalpm/conflict.c | 72 ++++-- lib/libalpm/package.c | 4 lib/libalpm/po/de.po | 475 ++++++++++++++++++++++++--------------------- lib/libalpm/po/fr.po | 477 ++++++++++++++++++++++++--------------------- lib/libalpm/po/hu.po | 482 ++++++++++++++++++++++++---------------------- lib/libalpm/po/it.po | 460 +++++++++++++++++++++++-------------------- lib/libalpm/po/pt_BR.po | 460 +++++++++++++++++++++++-------------------- lib/libalpm/remove.c | 10 lib/libalpm/sync.c | 2 lib/libalpm/util.c | 8 lib/libalpm/util.h | 2 src/pacman/po/de.po | 427 +++++++++++++++++++++------------------- src/pacman/po/fr.po | 416 ++++++++++++++++++++------------------- src/pacman/po/hu.po | 428 +++++++++++++++++++++------------------- src/pacman/po/it.po | 345 +++++++++++++++++--------------- src/pacman/po/pt_BR.po | 345 +++++++++++++++++--------------- 17 files changed, 2345 insertions(+), 2074 deletions(-)

1 0

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

13 Feb '07

Date: Monday, February 12, 2007 @ 20:50:18 Author: dan Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: pacman.c (1.95 -> 1.96) Fixed locale setting issues in the frontend, and fixed description of --cachedir. ----------+ pacman.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) Index: pacman-lib/src/pacman/pacman.c diff -u pacman-lib/src/pacman/pacman.c:1.95 pacman-lib/src/pacman/pacman.c:1.96 --- pacman-lib/src/pacman/pacman.c:1.95 Mon Feb 12 20:37:48 2007 +++ pacman-lib/src/pacman/pacman.c Mon Feb 12 20:50:18 2007 @@ -155,7 +155,7 @@ printf(_(" -v, --verbose be verbose\n")); printf(_(" -r, --root <path> set an alternate installation root\n")); printf(_(" -b, --dbpath <path> set an alternate database location\n")); - printf(_(" --cachedir <dir> set an alternate database location\n")); + printf(_(" --cachedir <dir> set an alternate package cache location\n")); } } @@ -435,13 +435,15 @@ signal(SIGSEGV, cleanup); /* i18n init */ - lang=getenv("LC_ALL"); - if(lang==NULL || lang[0]=='\0') - lang=getenv("LC_MESSAGES"); - if (lang==NULL || lang[0]=='\0') - lang=getenv("LANG"); + lang = setlocale(LC_ALL, ""); + /* if setlocale returns null, the locale was invalid- override it */ + if (lang == NULL) { + lang = "C"; + setlocale(LC_ALL, "C"); + setenv("LC_ALL", lang, 1); + MSG(NL, _("warning: default locale is invalid; using default \"C\" locale")); + } - setlocale(LC_ALL, lang); /* workaround for tr_TR */ if(lang && !strcmp(lang, "tr_TR")) setlocale(LC_CTYPE, "C");

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (4 files)
by Aaron Griffin 13 Feb '07

13 Feb '07

Date: Monday, February 12, 2007 @ 20:46:33 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: alpm.c (1.117 -> 1.118) be_files.c (1.26 -> 1.27) package.c (1.66 -> 1.67) package.h (1.28 -> 1.29) Removed desc_localized for the time being. We don't have localized descriptions, nor do we actually build them with the newest makepkg. The actual implementation in here seems like it could be done better, and it soaks a large amount of CPU time according to profilers. ------------+ alpm.c | 1 + be_files.c | 51 +++++++++++++++++++++++++++++++-------------------- package.c | 10 +++++++--- package.h | 4 ++-- 4 files changed, 41 insertions(+), 25 deletions(-) Index: pacman-lib/lib/libalpm/alpm.c diff -u pacman-lib/lib/libalpm/alpm.c:1.117 pacman-lib/lib/libalpm/alpm.c:1.118 --- pacman-lib/lib/libalpm/alpm.c:1.117 Sun Feb 11 23:45:21 2007 +++ pacman-lib/lib/libalpm/alpm.c Mon Feb 12 20:46:33 2007 @@ -613,6 +613,7 @@ /** Searches a database * @param db pointer to the package database to search in + * @param needles the list of strings to search for * @return the list of packages on success, NULL on error */ alpm_list_t SYMEXPORT *alpm_db_search(pmdb_t *db, alpm_list_t* needles) Index: pacman-lib/lib/libalpm/be_files.c diff -u pacman-lib/lib/libalpm/be_files.c:1.26 pacman-lib/lib/libalpm/be_files.c:1.27 --- pacman-lib/lib/libalpm/be_files.c:1.26 Wed Feb 7 17:08:37 2007 +++ pacman-lib/lib/libalpm/be_files.c Mon Feb 12 20:46:33 2007 @@ -197,8 +197,10 @@ struct stat buf; char path[PATH_MAX+1]; char line[513]; + /* alpm_list_t *tmplist; char *locale; + */ ALPM_LOG_FUNC; @@ -254,11 +256,16 @@ } _alpm_strtrim(info->filename); } else if(!strcmp(line, "%DESC%")) { + if(fgets(info->desc, sizeof(info->desc), fp) == NULL) { + goto error; + } + /* while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { info->desc_localized = alpm_list_add(info->desc_localized, strdup(line)); + PKG_ } - if((locale = setlocale(LC_ALL, "")) == NULL) { /* To fix segfault when locale invalid */ + if((locale = setlocale(LC_ALL, "")) == NULL) { //To fix segfault when locale invalid setenv("LC_ALL", "C", 1); locale = setlocale(LC_ALL, ""); } @@ -277,6 +284,7 @@ } } } + */ _alpm_strtrim(info->desc); } else if(!strcmp(line, "%GROUPS%")) { while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { @@ -485,7 +493,7 @@ if(strcmp(db->treename, "local") == 0) { local = 1; } - + /* DESC */ if(inforeq & INFRQ_DESC) { _alpm_log(PM_LOG_DEBUG, _("writing %s-%s DESC information back to db"), info->name, info->version); @@ -496,13 +504,16 @@ goto cleanup; } fprintf(fp, "%%NAME%%\n%s\n\n" - "%%VERSION%%\n%s\n\n", info->name, info->version); + "%%VERSION%%\n%s\n\n", info->name, info->version); if(info->desc[0]) { - fputs("%DESC%\n", fp); - for(lp = info->desc_localized; lp; lp = lp->next) { + /*fputs("%DESC%\n", fp); + for(lp = info->desc_localized; lp; lp = lp->next) { fprintf(fp, "%s\n", (char *)lp->data); - } - fprintf(fp, "\n"); + } + fprintf(fp, "\n"); + */ + fprintf(fp, "%%DESC%%\n" + "%s\n\n", info->desc); } if(info->groups) { fputs("%GROUPS%\n", fp); @@ -514,7 +525,7 @@ if(local) { if(info->url[0]) { fprintf(fp, "%%URL%%\n" - "%s\n\n", info->url); + "%s\n\n", info->url); } if(info->license) { fputs("%LICENSE%\n", fp); @@ -525,47 +536,47 @@ } if(info->arch[0]) { fprintf(fp, "%%ARCH%%\n" - "%s\n\n", info->arch); + "%s\n\n", info->arch); } if(info->builddate[0]) { fprintf(fp, "%%BUILDDATE%%\n" - "%s\n\n", info->builddate); + "%s\n\n", info->builddate); } if(info->buildtype[0]) { fprintf(fp, "%%BUILDTYPE%%\n" - "%s\n\n", info->buildtype); + "%s\n\n", info->buildtype); } if(info->installdate[0]) { fprintf(fp, "%%INSTALLDATE%%\n" - "%s\n\n", info->installdate); + "%s\n\n", info->installdate); } if(info->packager[0]) { fprintf(fp, "%%PACKAGER%%\n" - "%s\n\n", info->packager); + "%s\n\n", info->packager); } if(info->size) { fprintf(fp, "%%SIZE%%\n" - "%lu\n\n", info->size); + "%lu\n\n", info->size); } if(info->reason) { fprintf(fp, "%%REASON%%\n" - "%u\n\n", info->reason); + "%u\n\n", info->reason); } } else { if(info->size) { fprintf(fp, "%%CSIZE%%\n" - "%lu\n\n", info->size); + "%lu\n\n", info->size); } if(info->isize) { fprintf(fp, "%%ISIZE%%\n" - "%lu\n\n", info->isize); + "%lu\n\n", info->isize); } if(info->sha1sum) { fprintf(fp, "%%SHA1SUM%%\n" - "%s\n\n", info->sha1sum); + "%s\n\n", info->sha1sum); } else if(info->md5sum) { fprintf(fp, "%%MD5SUM%%\n" - "%s\n\n", info->md5sum); + "%s\n\n", info->md5sum); } } fclose(fp); @@ -646,7 +657,7 @@ } if(info->force) { fprintf(fp, "%%FORCE%%\n" - "\n"); + "\n"); } } fclose(fp); Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.66 pacman-lib/lib/libalpm/package.c:1.67 --- pacman-lib/lib/libalpm/package.c:1.66 Sat Feb 10 18:44:39 2007 +++ pacman-lib/lib/libalpm/package.c Mon Feb 12 20:46:33 2007 @@ -81,7 +81,7 @@ memcpy(newpkg, pkg, sizeof(pmpkg_t)); newpkg->license = alpm_list_strdup(pkg->license); - newpkg->desc_localized = alpm_list_strdup(pkg->desc_localized); + /*newpkg->desc_localized = alpm_list_strdup(pkg->desc_localized);*/ newpkg->requiredby = alpm_list_strdup(pkg->requiredby); newpkg->conflicts = alpm_list_strdup(pkg->conflicts); newpkg->files = alpm_list_strdup(pkg->files); @@ -108,7 +108,7 @@ } FREELIST(pkg->license); - FREELIST(pkg->desc_localized); + /*FREELIST(pkg->desc_localized);*/ FREELIST(pkg->files); FREELIST(pkg->backup); FREELIST(pkg->depends); @@ -216,6 +216,7 @@ } else if(!strcmp(key, "PKGVER")) { STRNCPY(info->version, ptr, sizeof(info->version)); } else if(!strcmp(key, "PKGDESC")) { + /* char *lang_tmp; info->desc_localized = alpm_list_add(info->desc_localized, strdup(ptr)); if((lang_tmp = (char *)malloc(strlen(setlocale(LC_ALL, "")))) == NULL) { @@ -223,11 +224,14 @@ } STRNCPY(lang_tmp, setlocale(LC_ALL, ""), strlen(setlocale(LC_ALL, ""))); if(info->desc_localized && !info->desc_localized->next) { - STRNCPY(info->desc, ptr, sizeof(info->desc)); + */ + STRNCPY(info->desc, ptr, sizeof(info->desc)); + /* } else if (ptr && !strncmp(ptr, lang_tmp, strlen(lang_tmp))) { STRNCPY(info->desc, ptr+strlen(lang_tmp)+1, sizeof(info->desc)); } FREE(lang_tmp); + */ } else if(!strcmp(key, "GROUP")) { info->groups = alpm_list_add(info->groups, strdup(ptr)); } else if(!strcmp(key, "URL")) { Index: pacman-lib/lib/libalpm/package.h diff -u pacman-lib/lib/libalpm/package.h:1.28 pacman-lib/lib/libalpm/package.h:1.29 --- pacman-lib/lib/libalpm/package.h:1.28 Sat Feb 10 18:50:31 2007 +++ pacman-lib/lib/libalpm/package.h Mon Feb 12 20:46:33 2007 @@ -41,7 +41,7 @@ #define PKG_FILENAME_LEN 512 #define PKG_NAME_LEN 256 #define PKG_VERSION_LEN 64 -#define PKG_FULLNAME_LEN (PKG_NAME_LEN-1)+1+(PKG_VERSION_LEN-1)+1 +#define PKG_FULLNAME_LEN (PKG_NAME_LEN + PKG_VERSION_LEN) #define PKG_DESC_LEN 512 #define PKG_URL_LEN 256 #define PKG_DATE_LEN 32 @@ -70,7 +70,7 @@ unsigned short force; time_t date; pmpkgreason_t reason; - alpm_list_t *desc_localized; + /* alpm_list_t *desc_localized;*/ alpm_list_t *license; alpm_list_t *replaces; alpm_list_t *groups;

1 0

Re: [pacman-dev] Latest RC 2007.02.12
by Alessio 'mOLOk' Bolognino 13 Feb '07

13 Feb '07

2007/2/12, Aaron Griffin <aaronmgriffin(a)gmail.com>: > [...] > So, please do whatever testing you can. Giovanni (voidnull) found two little bugs: 1. pacman -V shows an error message 2. in pacman -Sh the description of the --cachedir option is wrong. Here is a screenshot: http://themolok.netsons.org/uploads/pacman_bugs.jpg -- Alessio 'mOLOk' Bolognino Arch Linux Trusted User -- Alessio 'mOLOk' Bolognino Arch Linux Trusted User -- Alessio 'mOLOk' Bolognino Arch Linux Trusted User

2 1

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

13 Feb '07

Date: Monday, February 12, 2007 @ 20:37:48 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: pacman.c (1.94 -> 1.95) Reverted the exit 2 -> exit 0 change. This was there for a reason (so that pacman didn't check targets and spit out an error message). ----------+ pacman.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/src/pacman/pacman.c diff -u pacman-lib/src/pacman/pacman.c:1.94 pacman-lib/src/pacman/pacman.c:1.95 --- pacman-lib/src/pacman/pacman.c:1.94 Mon Feb 12 02:23:36 2007 +++ pacman-lib/src/pacman/pacman.c Mon Feb 12 20:37:48 2007 @@ -405,7 +405,7 @@ } if(config->version) { version(); - return(0); + return(2); } while(optind < argc) {

1 0