- Pacman-dev - lists.archlinux.org

Re: [pacman-dev] Splitting packages in makepkg
by Sergej Pupykin 17 Jun '08

17 Jun '08

Modified idea: PKGBUILD ------------------ pkgname=foobar pkgver=1.0 pkgrel=1 subpackages=(dev doc) pkgdesc="base package desc" pkgdesc_dev="foo dev desc" .... build() { ..... make DESTDIR=$startdir/pkg install ... make DESTDIR=$startdir/pkg-dev install ... make DESTDIR=$startdir/pkg-doc install } --------------- According to subpackages array makepkg creates 3 dirs: - $startdir/pkg (as usually) - $startdir/pkg-dev - $startdir/pkg-doc PKGBUILDs build function install all stuff into them And then, makepkg creates 3 packages: $pkgname-...pkg.tar.gz (if $startdir/pkg is not empty) $pkgname-dev-...pkg.tar.gz (if $startdir/pkg-dev is not empty) $pkgname-doc-...pkg.tar.gz (if $startdir/pkg-doc is not empty) May be I am not too famillar with bash, but you can get pkgdesc_dev at least with construction like this: $ export pkgdesc_dev="foo dev desc" $ export pkgdescname=pkgdesc_dev $ echo `bash -c "echo \$\`echo $pkgdescname\`"` foo dev desc It can be easy modified for full package names as I described above: subpackages=(foo foo-dev foo-doc kmail kopete) or pkgname=(foo foo-dev foo-doc kmail kopete)

2 1

[pacman-dev] FS#7982 - V2: patch to makepkg to allow PKGBUILDs building more than one package
by silvio＠port1024.net 16 Jun '08

16 Jun '08

AWKWARD! - Now I have test it before! Hello Friends, this is version2 of my patch. Explanation is in the patch. Please review and discuss this patch. Bye, eS.eF.

1 1

[pacman-dev] FS#7982 - V2: patch to makepkg to allow PKGBUILDs building more than one package
by silvio＠port1024.net 16 Jun '08

16 Jun '08

Sorry, I was too fast with send, without checkin :-) Hello Friends, this is version2 of my patch. Explanation is in the patch. Please review and discuss this patch. Bye, eS.eF.

1 1

[pacman-dev] FS#7982 - V2: patch to makepkg to allow PKGBUILDs building more than one package
by silvio＠port1024.net 16 Jun '08

16 Jun '08

Hello Friends, this is version2 of my patch. Explanation is in the patch. Please review and discuss this patch. Bye, eS.eF.

1 1

[pacman-dev] [PATCH] Use access() instead of stat() when possible
by Dan McGee 16 Jun '08

16 Jun '08

We were using the stat() system call in quite a few places when we didn't actually need anything the stat struct returned- we were simply checking for file existence. access() will be more efficient in those cases. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/be_files.c | 5 ++--- lib/libalpm/trans.c | 8 ++++---- lib/libalpm/util.c | 12 ++++-------- src/pacman/package.c | 5 ++--- src/pacman/util.c | 6 ++---- src/util/testdb.c | 8 +++----- 6 files changed, 17 insertions(+), 27 deletions(-) diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index 12c60b2..f5d4e82 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -355,7 +355,6 @@ static char *get_pkgpath(pmdb_t *db, pmpkg_t *info) int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) { FILE *fp = NULL; - struct stat buf; char path[PATH_MAX]; char line[513]; char *pkgpath = NULL; @@ -393,7 +392,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) pkgpath = get_pkgpath(db, info); - if(stat(pkgpath, &buf)) { + if(access(pkgpath, F_OK)) { /* directory doesn't exist or can't be opened */ _alpm_log(PM_LOG_DEBUG, "cannot find '%s-%s' in db '%s'\n", info->name, info->version, db->treename); @@ -631,7 +630,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) /* INSTALL */ if(inforeq & INFRQ_SCRIPTLET) { snprintf(path, PATH_MAX, "%sinstall", pkgpath); - if(!stat(path, &buf)) { + if(access(path, F_OK) == 0) { info->scriptlet = 1; } } diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index eb53e95..06084ae 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -25,6 +25,7 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> +#include <unistd.h> #include <sys/wait.h> #include <sys/types.h> #include <sys/stat.h> @@ -451,7 +452,6 @@ int _alpm_runscriptlet(const char *root, const char *installfn, char tmpdir[PATH_MAX]; char cwd[PATH_MAX]; char *scriptpath; - struct stat buf; pid_t pid; int clean_tmpdir = 0; int restore_cwd = 0; @@ -459,14 +459,14 @@ int _alpm_runscriptlet(const char *root, const char *installfn, ALPM_LOG_FUNC; - if(stat(installfn, &buf)) { + if(access(installfn, R_OK)) { /* not found */ _alpm_log(PM_LOG_DEBUG, "scriptlet '%s' not found\n", installfn); return(0); } /* NOTE: popen will use the PARENT's /bin/sh, not the chroot's */ - if(stat("/bin/sh", &buf)) { + if(access("/bin/sh", X_OK)) { /* not found */ _alpm_log(PM_LOG_ERROR, _("No /bin/sh in parent environment, aborting scriptlet\n")); return(0); @@ -474,7 +474,7 @@ int _alpm_runscriptlet(const char *root, const char *installfn, /* creates a directory in $root/tmp/ for copying/extracting the scriptlet */ snprintf(tmpdir, PATH_MAX, "%stmp/", root); - if(stat(tmpdir, &buf)) { + if(access(tmpdir, F_OK) != 0) { _alpm_makepath_mode(tmpdir, 01777); } snprintf(tmpdir, PATH_MAX, "%stmp/alpm_XXXXXX", root); diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 55bd46a..9199545 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -200,12 +200,11 @@ int _alpm_makepath_mode(const char *path, mode_t mode) str = orig; while((ptr = strsep(&str, "/"))) { if(strlen(ptr)) { - struct stat buf; /* we have another path component- append the newest component to * existing string and create one more level of dir structure */ strcat(incr, "/"); strcat(incr, ptr); - if(stat(incr, &buf)) { + if(access(incr, F_OK)) { if(mkdir(incr, mode)) { ret = 1; break; @@ -533,12 +532,11 @@ int _alpm_logaction(unsigned short usesyslog, FILE *f, const char *fmt, va_list int _alpm_ldconfig(const char *root) { char line[PATH_MAX]; - struct stat buf; snprintf(line, PATH_MAX, "%setc/ld.so.conf", root); - if(stat(line, &buf) == 0) { + if(access(line, F_OK) == 0) { snprintf(line, PATH_MAX, "%ssbin/ldconfig", root); - if(stat(line, &buf) == 0) { + if(access(line, X_OK) == 0) { char cmd[PATH_MAX]; snprintf(cmd, PATH_MAX, "%s -r %s", line, root); system(cmd); @@ -561,7 +559,6 @@ int _alpm_str_cmp(const void *s1, const void *s2) */ char *_alpm_filecache_find(const char* filename) { - struct stat buf; char path[PATH_MAX]; char *retpath; alpm_list_t *i; @@ -570,8 +567,7 @@ char *_alpm_filecache_find(const char* filename) for(i = alpm_option_get_cachedirs(); i; i = alpm_list_next(i)) { snprintf(path, PATH_MAX, "%s%s", (char*)alpm_list_getdata(i), filename); - if(stat(path, &buf) == 0) { - /* TODO maybe check to make sure it is readable? */ + if(access(path, R_OK) == 0) { retpath = strdup(path); _alpm_log(PM_LOG_DEBUG, "found cached pkg: %s\n", retpath); return(retpath); diff --git a/src/pacman/package.c b/src/pacman/package.c index 1698806..0680037 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -22,8 +22,8 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> +#include <unistd.h> #include <limits.h> -#include <sys/stat.h> #include <wchar.h> #include <alpm.h> @@ -176,7 +176,6 @@ void dump_pkg_backups(pmpkg_t *pkg) if(alpm_pkg_get_backup(pkg)) { /* package has backup files, so print them */ for(i = alpm_pkg_get_backup(pkg); i; i = alpm_list_next(i)) { - struct stat buf; char path[PATH_MAX]; char *str = strdup(alpm_list_getdata(i)); char *ptr = index(str, '\t'); @@ -188,7 +187,7 @@ void dump_pkg_backups(pmpkg_t *pkg) ptr++; snprintf(path, PATH_MAX-1, "%s%s", root, str); /* if we find the file, calculate checksums, otherwise it is missing */ - if(!stat(path, &buf)) { + if(access(path, R_OK) == 0) { char *md5sum = alpm_get_md5sum(path); if(md5sum == NULL) { diff --git a/src/pacman/util.c b/src/pacman/util.c index e702886..d7ac9e3 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -22,7 +22,6 @@ #include <sys/types.h> #include <sys/ioctl.h> #include <sys/time.h> -#include <sys/stat.h> #include <stdio.h> #include <stdlib.h> @@ -125,7 +124,7 @@ int makepath(const char *path) * orig - a copy of path so we can safely butcher it with strsep * str - the current position in the path string (after the delimiter) * ptr - the original position of str after calling strsep - * incr - incrementally generated path for use in stat/mkdir call + * incr - incrementally generated path for use in access/mkdir call */ char *orig, *str, *ptr, *incr; mode_t oldmask = umask(0000); @@ -136,12 +135,11 @@ int makepath(const char *path) str = orig; while((ptr = strsep(&str, "/"))) { if(strlen(ptr)) { - struct stat buf; /* we have another path component- append the newest component to * existing string and create one more level of dir structure */ strcat(incr, "/"); strcat(incr, ptr); - if(stat(incr, &buf)) { + if(access(incr, F_OK)) { if(mkdir(incr, 0755)) { ret = 1; break; diff --git a/src/util/testdb.c b/src/util/testdb.c index f354eca..87bfcf9 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -23,7 +23,6 @@ #include <errno.h> #include <limits.h> #include <string.h> -#include <sys/stat.h> #include <dirent.h> #include <libgen.h> @@ -61,7 +60,6 @@ static int db_test(char *dbpath) { struct dirent *ent; char path[PATH_MAX]; - struct stat buf; int ret = 0; DIR *dir; @@ -77,17 +75,17 @@ static int db_test(char *dbpath) } /* check for desc, depends, and files */ snprintf(path, PATH_MAX, "%s/%s/desc", dbpath, ent->d_name); - if(stat(path, &buf)) { + if(access(path, F_OK)) { printf("%s: description file is missing\n", ent->d_name); ret++; } snprintf(path, PATH_MAX, "%s/%s/depends", dbpath, ent->d_name); - if(stat(path, &buf)) { + if(access(path, F_OK)) { printf("%s: dependency file is missing\n", ent->d_name); ret++; } snprintf(path, PATH_MAX, "%s/%s/files", dbpath, ent->d_name); - if(stat(path, &buf)) { + if(access(path, F_OK)) { printf("%s: file list is missing\n", ent->d_name); ret++; } -- 1.5.5.3

2 1

[pacman-dev] FS#7982 - patch to makepkg to allow PKGBUILDs building more than one package
by silvio＠port1024.net 15 Jun '08

15 Jun '08

Hello Freaks, This patch is for building more than one package with makepkg. Please review and discuss this patch! -- eS.eF.

6 7

Re: [pacman-dev] [PATCH] makepkg.sh.in is prepared for building of splittet packages
by Xavier 15 Jun '08

15 Jun '08

Xavier wrote: >> Also it is rather strange that there is no space between your name and >> mail address. Did you do something like the above : >> git repo-config user.name "Your Name" >> git repo-config user.email "me(a)example.com" > >> silvio(a)port1024.net wrote: >>> From: Silvio fricke<silvio(a)port1024.net> > > Very strange, because [1] show me that I have spaces between my name and > address. > Oops, seems to be a thunderbird issue when replying. >> I have only minor "appearance" issues to address here, I don't know what >> to think about the patch itself. Only that it does not seem too big and >> mostly concentrated in one place, which is good. > > Ok, fine! > >> So first, isn't the correct term "splitted"? >> It seems that you use both "split" and "splittet" which would then be >> incorrect. > > Hmm, english is not my native language and I need help in language > things. > But I have the suggestions from [2] used. > Yeah, use split. >> Also you should read this : >> http://archlinux.org/pacman/submitting-patches.html >> Especially this part : >> << >> Describe your patch. >> >> Before the actual diff begins, it helps if you describe the changes in >> the patch. This allows others to see what you intended so as to compare >> it to what was actually done, and allows better feedback. If you use >> git-format-patch to create your patch, then your commit message will be >> shown above the patch by default. >> >> > > Right you are! The next version of this patch has a more descriptive > description. > Good. Also have a look at Allan's suggestion. Seems like the whole patch would be nicer if it could use a loop.

1 0

[pacman-dev] Hi all
by Lanziani Luca 15 Jun '08

15 Jun '08

Hi all, I'm new in pacman-dev, i would like to put a counter in pacman that say how many Kbyte/time left from the end of packages download, something like... gstreamer0.10-base- 227,0K 435,7K/s 00:00:01 [####################] 100% 47110 Kbyte left libgtop-2.22.2-1-i686 109,5K 332,3K/s 00:00:00 [#################] 100% 47000 Kbyte left Very useful when i'm at university and i have only 10 minute, if i don't know how many time pacman need for download all packages, i can't decide if stop it or attend the end. Now i want know the better place to write the code for do that... "I code better than i write in english IMHO :P". I find the function _alpm_downloadfiles_forreal_ .... thanks, Luca

2 1

[pacman-dev] [PATCH] Expand PKGBUILD documentation
by Dan McGee 14 Jun '08

14 Jun '08

Add documentation for $startdir, $srcdir, and $pkgdir variables, as well as general information about the build() function and about custom variables in PKGBUILDs. This addresses FS#10634. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- doc/PKGBUILD.5.txt | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 43 insertions(+), 1 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index ac39472..f4ddc83 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -30,12 +30,22 @@ distribution of this package. Options and Directives ---------------------- +The following is a list of standard options and directives available for use +in a PKGBUILD. These are all understood and interpreted by makepkg, and most +will be directly transferred to the built package. + +If you need to create any custom variables for use in your build process, it is +recommended to name your custom variables with an '_' (underscore) prefix. +This will prevent any possible name clashes with internal makepkg variables. +For example, to store the base kernel version in a variable, use something +similar to `$_basekernver`. + *pkgname*:: The name of the package. This has be a unix-friendly name as it will be used in the package filename. *pkgver*:: - The version of the software as released from the author (e.g. \'2.7.1'). + The version of the software as released from the author (e.g. '2.7.1'). *pkgrel*:: This is the release number specific to the Arch Linux release. This @@ -205,6 +215,38 @@ Options and Directives of a package changes (or is alphanumeric). +build() Function +---------------- +In addition to the above directives, the build() bash function comprises the +remainder of the PKGBUILD. This is directly sourced and executed by makepkg, so +anything that bash or the system has available is available for use here. Be +sure any exotic commands used are covered by `makedepends`. + +All of the above variables such as `pkgname` and `pkgver` are available for use +in the build function. In addition, makepkg defines three variables for your +use during the build and install process. These three variables are as follows: + +*startdir*:: + This contains the absolute path to the directory where the PKGBUILD was + located, which is usually the output of `$(pwd)` when makepkg is started. + $$startdir$$ was most often used in combination with `/src` or `/pkg` + postfixes, but use of the `srcdir` and `pkgdir` variables is preferred. + +*srcdir*:: + This points to the directory where makepkg extracts or copies all source + files. Although it currently is an alias for `$startdir/src`, this + assumption should not be assumed true for all future revisions of makepkg. + +*pkgdir*:: + This points to the directory where makepkg bundles the installed package + (this directory will become the root directory of your built package). + Although it currently is an alias for `$startdir/pkg`, this assumption + should not be assumed true for all future revisions of makepkg. + +If you create any variables of your own in the build function, it is +recommended to use the bash `local` keyword to scope the variable to inside +the build function. + Install/Upgrade/Remove Scripting -------------------------------- Pacman has the ability to store and execute a package-specific script when it -- 1.5.5.3

3 2

[pacman-dev] [PATCH] Combine repo-add and repo-remove into one script
by Dan McGee 14 Jun '08

14 Jun '08

They shared about 75% of their code, so there is no real reason we should maintain them separately. Merge the differences accordingly and add a check based on the basename of the command used to decide what behavior to follow. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- po/POTFILES.in | 1 - scripts/Makefile.am | 16 ++-- scripts/repo-add.sh.in | 93 ++++++++++++++------ scripts/repo-remove.sh.in | 211 --------------------------------------------- 4 files changed, 76 insertions(+), 245 deletions(-) delete mode 100644 scripts/repo-remove.sh.in diff --git a/po/POTFILES.in b/po/POTFILES.in index 73640f2..10175bf 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -16,4 +16,3 @@ src/pacman/util.c scripts/makepkg.sh.in scripts/pacman-optimize.sh.in scripts/repo-add.sh.in -scripts/repo-remove.sh.in diff --git a/scripts/Makefile.am b/scripts/Makefile.am index e6c051b..283556e 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -2,18 +2,20 @@ AUTOMAKE_OPTIONS = std-options bin_SCRIPTS = \ + $(OURSCRIPTS) \ + repo-remove + +OURSCRIPTS = \ makepkg \ pacman-optimize \ rankmirrors \ - repo-add \ - repo-remove + repo-add EXTRA_DIST = \ makepkg.sh.in \ pacman-optimize.sh.in \ rankmirrors.py.in \ - repo-add.sh.in \ - repo-remove.sh.in + repo-add.sh.in # Files that should be removed, but which Automake does not know. MOSTLYCLEANFILES = $(bin_SCRIPTS) *.tmp @@ -42,7 +44,7 @@ edit = sed \ ## wrong file by accident. # two 'test' lines- make sure we can handle both sh and py type scripts # third 'test' line- make sure one of the two checks succeeded -$(bin_SCRIPTS): Makefile +$(OURSCRIPTS): Makefile rm -f $@ $@.tmp test -f $(srcdir)/$@.sh.in && $(edit) $(srcdir)/$@.sh.in >$@.tmp || true test -f $(srcdir)/$@.py.in && $(edit) $(srcdir)/$@.py.in >$@.tmp || true @@ -55,7 +57,7 @@ makepkg: $(srcdir)/makepkg.sh.in pacman-optimize: $(srcdir)/pacman-optimize.sh.in rankmirrors: $(srcdir)/rankmirrors.py.in repo-add: $(srcdir)/repo-add.sh.in -repo-remove: $(srcdir)/repo-remove.sh.in -re-pacman: $(srcdir)/re-pacman.sh.in +repo-remove: $(srcdir)/repo-add.sh.in + ln -s repo-add repo-remove # vim:set ts=2 sw=2 noet: diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 53a7da5..b6772db 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -1,9 +1,11 @@ #!/bin/bash # # repo-add - add a package to a given repo database file +# repo-remove - remove a package entry from a given repo database file # @configure_input@ # # Copyright (c) 2006-2008 Aaron Griffin <aaron(a)archlinux.org> +# Copyright (c) 2007-2008 Dan McGee <dan(a)archlinux.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -55,33 +57,41 @@ error() { # print usage instructions usage() { - printf "repo-add (pacman) %s\n\n" "$myver" - printf "$(gettext "Usage: %s [-q] <path-to-db> <package> ...\n\n")" "$0" + printf "repo-add, repo-remove (pacman) %s\n\n" "$myver" + printf "$(gettext "Usage: repo-add [-q] <path-to-db> <package> ...\n")" + printf "$(gettext "Usage: repo-remove [-q] <path-to-db> <packagename> ...\n\n")" printf "$(gettext "\ repo-add will update a package database by reading a package file.\n\ Multiple packages to add can be specified on the command line.\n\n")" printf "$(gettext "\ -The -q/--quiet flag will force this program to run silently except\n\ +repo-remove will update a package database by removing the package name\n\ +specified on the command line from the given repo database. Multiple\n\ +packages to remove can be specified on the command line.\n\n")" + printf "$(gettext "\ +The -q/--quiet flag to either program will force silent running except\n\ in the case of warnings or errors.\n\n")" echo "$(gettext "Example: repo-add /path/to/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz")" + echo "$(gettext "Example: repo-remove /path/to/repo.db.tar.gz kernel26")" } version() { - printf "repo-add (pacman) %s\n" "$myver" + printf "repo-add, repo-remove (pacman) %s\n\n" "$myver" printf "$(gettext "\ -Copyright (C) 2006-2008 Aaron Griffin <aaron(a)archlinux.org>.\n\n\ +Copyright (C) 2006-2008 Aaron Griffin <aaron(a)archlinux.org>.\n\ +Copyright (c) 2007-2008 Dan McGee <dan(a)archlinux.org>.\n\n\ This is free software; see the source for copying conditions.\n\ There is NO WARRANTY, to the extent permitted by law.\n")" } # test if a file is a repository DB +# arg1 - command name (repo-add, repo-remove) test_repo_db_file () { if [ -f "$REPO_DB_FILE" ]; then if bsdtar -tf "$REPO_DB_FILE" | grep -q "/desc"; then return 0 # YES fi - else - return 0 # YES - No database file is also allowed + elif [ "$1" == "repo-add" ]; then + return 0 # YES - No database file is also allowed if we are adding fi return 1 # NO @@ -177,14 +187,8 @@ db_write_entry() return 1 fi - # remove any other package in the DB with same name - local existing - for existing in *; do - if [ "${existing%-*-*}" = "$pkgname" ]; then - msg2 "$(gettext "Removing existing package '%s'...")" "$existing" - rm -rf "$existing" - fi - done + # remove an existing entry if it exists, ignore failures + db_remove_entry "$pkgname" # create package directory mkdir "$pkgname-$pkgver" @@ -251,6 +255,23 @@ db_write_entry() popd 2>&1 >/dev/null } # end db_write_entry +# remove existing entries from the DB +# arg1 - package name +db_remove_entry() { + pushd "$gstmpdir" 2>&1 >/dev/null + + # remove any other package in the DB with same name + local existing + for existing in *; do + if [ "${existing%-*-*}" = "$1" ]; then + msg2 "$(gettext "Removing existing package '%s'...")" "$existing" + rm -rf "$existing" + fi + done + + popd 2>&1 >/dev/null +} # end db_remove_entry + # PROGRAM START # determine whether we have gettext; make it a no-op if we do not @@ -301,10 +322,17 @@ if [ -r ~/.makepkg.conf ]; then fi # main routine -gstmpdir=$(mktemp -d /tmp/repo-add.XXXXXXXXXX) || (\ +gstmpdir=$(mktemp -d /tmp/repo-tools.XXXXXXXXXX) || (\ error "$(gettext "Cannot create temp directory for database building.")"; \ exit 1) +# figure out what program we are +cmd="$(basename $0)" +if [ "$cmd" != "repo-add" -a "$cmd" != "repo-remove" ]; then + error "$(gettext "Invalid command name '%s' specified.")" "$cmd" + exit 1 +fi + success=0 # parse arguments for arg in "$@"; do @@ -316,7 +344,7 @@ for arg in "$@"; do elif [ -z "$REPO_DB_FILE" ]; then # store absolute path to repo DB REPO_DB_FILE=$($realpath "$arg") - if ! test_repo_db_file; then + if ! test_repo_db_file $cmd; then error "$(gettext "Repository file '%s' is not a proper pacman database.")" "$REPO_DB_FILE" exit 1 elif [ -f "$REPO_DB_FILE" ]; then @@ -324,18 +352,28 @@ for arg in "$@"; do bsdtar -xf "$REPO_DB_FILE" -C "$gstmpdir" fi else - if [ -f "$arg" ]; then - if ! bsdtar -tf "$arg" .PKGINFO 2>&1 >/dev/null; then - error "$(gettext "'%s' is not a package file, skipping")" "$arg" + if [ "$cmd" == "repo-add" ]; then + if [ -f "$arg" ]; then + if ! bsdtar -tf "$arg" .PKGINFO 2>&1 >/dev/null; then + error "$(gettext "'%s' is not a package file, skipping")" "$arg" + else + msg "$(gettext "Adding package '%s'")" "$arg" + + if db_write_entry "$arg"; then + success=1 + fi + fi else - msg "$(gettext "Adding package '%s'")" "$arg" + error "$(gettext "Package '%s' not found.")" "$arg" + fi + elif [ "$cmd" == "repo-remove" ]; then + msg "$(gettext "Searching for package '%s'...")" "$arg" - if db_write_entry "$arg"; then - success=1 - fi + if db_remove_entry "$arg"; then + success=1 + else + error "$(gettext "Package matching '%s' not found.")" "$arg" fi - else - error "$(gettext "Package '%s' not found.")" "$arg" fi fi done @@ -356,6 +394,9 @@ if [ $success -eq 1 ]; then esac bsdtar -c${TAR_OPT}f "$REPO_DB_FILE" * + elif [ "$cmd" == "repo-remove" ]; then + error "$(gettext "All packages have been removed from the database. Deleting '%s'.")" "$REPO_DB_FILE" + rm "$REPO_DB_FILE" fi popd 2>&1 >/dev/null diff --git a/scripts/repo-remove.sh.in b/scripts/repo-remove.sh.in deleted file mode 100644 index a650bcf..0000000 --- a/scripts/repo-remove.sh.in +++ /dev/null @@ -1,211 +0,0 @@ -#!/bin/bash -# -# repo-remove - remove a package entry from a given repo database file -# @configure_input@ -# -# Copyright (c) 2007-2008 Dan McGee <dan(a)archlinux.org> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# gettext initialization -export TEXTDOMAIN='pacman' -export TEXTDOMAINDIR='@localedir@' - -myver='@PACKAGE_VERSION@' -confdir='@sysconfdir@' - -QUIET=0 -REPO_DB_FILE="" - -msg() { - [ $QUIET -ne 0 ] && return - local mesg=$1; shift - printf "==> ${mesg}\n" "$@" >&1 -} - -msg2() { - [ $QUIET -ne 0 ] && return - local mesg=$1; shift - printf " -> ${mesg}\n" "$@" >&1 -} - -warning() { - local mesg=$1; shift - printf "==> $(gettext "WARNING:") ${mesg}\n" "$@" >&2 -} - -error() { - local mesg=$1; shift - printf "==> $(gettext "ERROR:") ${mesg}\n" "$@" >&2 -} - -# print usage instructions -usage() { - printf "$(gettext "repo-remove %s\n\n")" $myver - printf "$(gettext "usage: %s [-q] <path-to-db> <packagename> ...\n\n")" "$0" - printf "$(gettext "\ -repo-remove will update a package database by removing the package name\n\ -specified on the command line from the given repo database. Multiple\n\ -packages to remove can be specified on the command line.\n\n")" - printf "$(gettext "\ -The -q/--quiet flag will force this program to run silently except\n\ -in the case of warnings or errors.\n\n")" - echo "$(gettext "Example: repo-remove /path/to/repo.db.tar.gz kernel26")" -} - -version() { - printf "repo-remove (pacman) %s\n" "$myver" - printf "$(gettext "\ -Copyright (c) 2007-2008 Dan McGee <dan(a)archlinux.org>.\n\n\ -This is free software; see the source for copying conditions.\n\ -There is NO WARRANTY, to the extent permitted by law.\n")" -} - -# test if a file is a repository DB -test_repo_db_file () { - if [ -f "$REPO_DB_FILE" ]; then - if bsdtar -tf "$REPO_DB_FILE" | grep -q "/desc"; then - return 0 # YES - fi - fi - - return 1 # NO -} - -# remove existing entries from the DB -db_remove_entry() { - pushd "$gstmpdir" 2>&1 >/dev/null - - # remove any other package in the DB with same name - local existing - for existing in *; do - if [ "${existing%-*-*}" = "$1" ]; then - msg2 "$(gettext "Removing existing package '%s'...")" "$existing" - rm -rf "$existing" - fi - done - - popd 2>&1 >/dev/null -} # end db_remove_entry - -# PROGRAM START - -# determine whether we have gettext; make it a no-op if we do not -if [ ! $(type -t gettext) ]; then - gettext() { - echo "$@" - } -fi - -# check for help flags -if [ "$1" = "-h" -o "$1" = "--help" ]; then - usage - exit 0 -fi - -# check for version flags -if [ "$1" = "-V" -o "$1" = "--version" ]; then - version - exit 0 -fi - -# check for correct number of args -if [ $# -lt 2 ]; then - usage - exit 1 -fi - -# check for and store the name of a realpath-like program -if [ $(type -t realpath) ]; then - realpath='realpath' -elif [ $(type -t readlink) ]; then - realpath='readlink -f' -else - error "$(gettext "Either realpath or readlink are required by repo-add.")" - exit 1 # $E_MISSING_PROGRAM -fi - -# source system and user makepkg.conf -if [ -r "$confdir/makepkg.conf" ]; then - source "$confdir/makepkg.conf" -else - error "$(gettext "%s not found. Cannot continue.")" "$confdir/makepkg.conf" - exit 1 # $E_CONFIG_ERROR -fi - -if [ -r ~/.makepkg.conf ]; then - source ~/.makepkg.conf -fi - -# main routine -gstmpdir=$(mktemp -d /tmp/repo-remove.XXXXXXXXXX) || (\ - error "$(gettext "Cannot create temp directory for database building.")"; \ - exit 1) - -success=0 -# parse arguments -for arg in "$@"; do - if [ "$arg" == "--quiet" -o "$arg" == "-q" ]; then - QUIET=1 - elif [ -z "$REPO_DB_FILE" ]; then - # store absolute path to repo DB - REPO_DB_FILE=$($realpath "$arg") - if ! test_repo_db_file; then - error "$(gettext "Repository file '%s' is not a proper pacman database.")" "$REPO_DB_FILE" - exit 1 - elif [ -f "$REPO_DB_FILE" ]; then - msg "$(gettext "Extracting database to a temporary location...")" - bsdtar -xf "$REPO_DB_FILE" -C "$gstmpdir" - fi - else - msg "$(gettext "Searching for package '%s'...")" "$arg" - - if db_remove_entry "$arg"; then - success=1 - else - error "$(gettext "Package matching '%s' not found.")" "$arg" - fi - fi -done - -# if all operations were a success, re-zip database -if [ $success -eq 1 ]; then - msg "$(gettext "Creating updated database file '%s'")" "$REPO_DB_FILE" - pushd "$gstmpdir" 2>&1 >/dev/null - - if [ -n "$(ls)" ]; then - [ -f "${REPO_DB_FILE}.old" ] && rm "${REPO_DB_FILE}.old" - [ -f "$REPO_DB_FILE" ] && mv "$REPO_DB_FILE" "${REPO_DB_FILE}.old" - - case "$DB_COMPRESSION" in - gz) TAR_OPT="z" ;; - bz2) TAR_OPT="j" ;; - *) warning "$(gettext "No compression set.")" ;; - esac - - bsdtar -c${TAR_OPT}f "$REPO_DB_FILE" * - else - error "$(gettext "All packages have been removed from the database. Deleting '%s'.")" "$REPO_DB_FILE" - rm "$REPO_DB_FILE" - fi - - popd 2>&1 >/dev/null -else - msg "$(gettext "No packages modified, nothing to do.")" -fi - -# remove the temp directory used to unzip -[ -d "$gstmpdir" ] && rm -rf "$gstmpdir" - -# vim: set ts=2 sw=2 noet: -- 1.5.5.3

3 3

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.1.4-16-g331891c
by Dan McGee 13 Jun '08

13 Jun '08

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via 331891ceb158a4fc1e47ae52d3968ebdb7e9b223 (commit) via 6d737254fcc758b94b7372b51dcf1ea907c53d8e (commit) via 512282ca5415c4c053291ed0ec7819a2787f141d (commit) from 4a802838cb2e2d1eca4c4e07b31a923dc29bd1e3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: lib/libalpm/po/de.po | 2 +- po/LINGUAS | 1 + po/fr.po | 4 +- po/tr.po | 1699 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 1703 insertions(+), 3 deletions(-) create mode 100644 po/tr.po hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.1.4-205-g7313c85
by Dan McGee 13 Jun '08

13 Jun '08

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 7313c8546ae0a2c38768d665b3f314ee0cf959c4 (commit) via 331891ceb158a4fc1e47ae52d3968ebdb7e9b223 (commit) via 6d737254fcc758b94b7372b51dcf1ea907c53d8e (commit) via 0077bfa3a07725db281c55821a459acb84895225 (commit) via 7fc306cd41be8586e2d7fb3cc9595fe3bd58b4c1 (commit) via 1824bc6ee6c67b248c478d3fdd0f1995cb652b6c (commit) via f827c9572e9c8a21d57e58bd61038226e9e0c05e (commit) via 4979157cba9aaf5e9b3488b17b0b50f484614169 (commit) via 0fc538fcdb149141fe25448db5805f2ff790e8fa (commit) via 512282ca5415c4c053291ed0ec7819a2787f141d (commit) via fcac23763b0cd6242a1e126b5063d95d4a46fd09 (commit) via b04d6e751a4359337c84128681a06f436c99197a (commit) via 4a802838cb2e2d1eca4c4e07b31a923dc29bd1e3 (commit) from 5ae02e6ae72b7648318e319eba9ab02f489d858a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7313c8546ae0a2c38768d665b3f314ee0cf959c4 Merge: 0077bfa3a07725db281c55821a459acb84895225 331891ceb158a4fc1e47ae52d3968ebdb7e9b223 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 12 19:21:06 2008 -0500 Merge branch 'maint' commit 0077bfa3a07725db281c55821a459acb84895225 Author: Juan Pablo González Tognarelli <lord_jotape(a)yahoo.com.ar> Date: Thu Jun 12 19:10:43 2008 -0500 Spanish translation updates Fixes to old translations and new strings for upcoming 3.2 release. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7fc306cd41be8586e2d7fb3cc9595fe3bd58b4c1 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 12 19:06:14 2008 -0500 Use shell builtin to list files for package inclusion On BSD systems, as super user, the 'ls' command displays all dot files by default, causing these to get included when not intended. If we use the bash glob operator, we can avoid issues with ls on different platforms; however, we need to turn the nullglob shell option on first to ensure we don't have problems in empty directories. Originally-noticed-by: Sebastian Nowicki <sebnow(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1824bc6ee6c67b248c478d3fdd0f1995cb652b6c Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jun 8 17:26:02 2008 -0500 Allow use of GIT_VERSION in documentation dir Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f827c9572e9c8a21d57e58bd61038226e9e0c05e Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jun 2 00:05:50 2008 -0500 makepkg: remove deprecated --usesudo code Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4979157cba9aaf5e9b3488b17b0b50f484614169 Author: Allan McRae <mcrae_allan(a)hotmail.com> Date: Sat Jun 7 11:58:21 2008 +1000 makepkg: add --allsource option This supplements the --source option and does nearly the same thing, except downloaded source files are included in the archive as well. The sources are now packages with a pkgname/ prefix. Original-work-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0fc538fcdb149141fe25448db5805f2ff790e8fa Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jun 8 13:50:01 2008 -0500 Various updates needed prior to a new release Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fcac23763b0cd6242a1e126b5063d95d4a46fd09 Author: Allan McRae <mcrae_allan(a)hotmail.com> Date: Fri Jun 6 20:17:06 2008 +1000 bacman - regenerate package from system Original work by Carlo "carlocci" Bersani with additions by Xavier Chantry and Allan McRae This script rebuilds an already installed package using metadata stored into the pacman database and system files. Replaces the outdated re-pacman script Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b04d6e751a4359337c84128681a06f436c99197a Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 5 14:32:19 2008 -0500 Reformat -Sg output to look like -Qg We used list_display() on -Sg output, which might have been slightly nicer looking but made it much harder to parse in something like a shell script. Reformat it in the 'grpname pkgname' format that -Qg is already using. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/Makefile.am | 2 +- contrib/README | 2 +- contrib/bacman | 282 ++++++++ contrib/re-pacman | 77 -- doc/Makefile.am | 10 +- doc/PKGBUILD-example.txt | 6 +- doc/PKGBUILD.5.txt | 15 +- doc/footer.txt | 11 +- doc/pacman.8.txt | 7 +- doc/pacman.conf.5.txt | 11 +- etc/pacman.conf.in | 2 + lib/libalpm/po/POTFILES.in | 7 +- lib/libalpm/po/de.po | 2 +- lib/libalpm/po/es.po | 227 +++---- pactest/Makefile.am | 3 +- po/LINGUAS | 1 + po/POTFILES.in | 2 +- po/es.po | 792 ++++++++------------- po/fr.po | 4 +- po/tr.po | 1699 ++++++++++++++++++++++++++++++++++++++++++++ scripts/makepkg.sh.in | 61 ++- src/pacman/pacman.c | 6 +- src/pacman/sync.c | 25 +- 23 files changed, 2480 insertions(+), 774 deletions(-) create mode 100755 contrib/bacman delete mode 100755 contrib/re-pacman create mode 100644 po/tr.po hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] spanish translation
by Juan Pablo Gonzalez T. 13 Jun '08

13 Jun '08

i know that the string freeze is not declared yet. but now i have time to do the translation job. also i did a few fixes to the old ones texts. this files are bassed on a git sync of today (june 12) greetings! -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | Juan Pablo González Tognarelli | http://lacasadeljota.blogspot.com - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

2 1

[pacman-dev] Dependency resolution in package management systems
by Xavier 12 Jun '08

12 Jun '08

I wanted to have an overview of pisi, which seems to be an interesting package manager in python (for the Pardus linux distrib), and I felt on a small paper formalizing how the dependency resolution is done. http://www.pardus.org.tr/eng/projects/pisi/index.html http://svn.pardus.org.tr/uludag/trunk/pisi/doc/dependency.pdf I found it interesting so wanted to share it with others ;) There are also many neat features : http://www.pardus.org.tr/eng/projects/pisi/PiSi.html

1 0

[pacman-dev] [PATCH] Make sure dot files don't get included in package
by Sebastian Nowicki 12 Jun '08

12 Jun '08

On BSD systems, as a super user, `ls` displays all dot files by default. On most BSD systems -I can be used to suppress this behavior, but this argument is not available on Mac OSX. Instead, grep is used to filter out all dot files. Signed-off-by: Sebastian Nowicki <sebnow(a)gmail.com> --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index cb55dea..f4acd50 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -849,7 +849,7 @@ create_package() { local pkg_file="$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" - if ! bsdtar -czf "$pkg_file" $comp_files $(ls); then + if ! bsdtar -czf "$pkg_file" $comp_files $(ls | grep -v '^\.'); then error "$(gettext "Failed to create package file.")" exit 1 # TODO: error code fi -- 1.5.5.1

4 6

[pacman-dev] [PATCH] Fix warning messages when syncing installed package
by Allan McRae 11 Jun '08

11 Jun '08

The patch fixes the warning messages when syncing a package where the local version is newer that the db version. Also, all messages are suppressed when using --print-uris and messages about upgrading or reinstalling are suppressed when using --downloadonly Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> --- lib/libalpm/sync.c | 33 +++++++++++++++++++++++++++------ 1 files changed, 27 insertions(+), 6 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 3dc54d0..f10e1b3 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -333,19 +333,40 @@ int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sy local = _alpm_db_get_pkgfromcache(db_local, alpm_pkg_get_name(spkg)); if(local) { - if(_alpm_pkg_compare_versions(local, spkg) == 0) { - /* spkg is NOT an upgrade */ + int cmp = alpm_pkg_vercmp(alpm_pkg_get_version(spkg), alpm_pkg_get_version(local)); + + if(cmp == -1) { + /* local is newer than spkg */ + _alpm_db_read(spkg->origin_data.db, spkg, INFRQ_DESC); + if(spkg->force) { + if(!(trans->flags & (PM_TRANS_FLAG_DOWNLOADONLY | PM_TRANS_FLAG_PRINTURIS))) { + _alpm_log(PM_LOG_WARNING, _("%s: forcing upgrade to version %s\n"), + alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg)); + } + } else { + /* we are downgrading */ + if(!(trans->flags & (PM_TRANS_FLAG_DOWNLOADONLY | PM_TRANS_FLAG_PRINTURIS))) { + pmdb_t *db = spkg->origin_data.db; + _alpm_log(PM_LOG_WARNING, _("%s-%s is newer than in %s -- downgrading\n"), + alpm_pkg_get_name(local), alpm_pkg_get_version(local), + alpm_db_get_name(db)); + } + } + } else if(cmp == 0) { + /* spkg has same version as local */ if(trans->flags & PM_TRANS_FLAG_NEEDED) { - _alpm_log(PM_LOG_WARNING, _("%s-%s is up to date -- skipping\n"), - alpm_pkg_get_name(local), alpm_pkg_get_version(local)); + if(!(trans->flags & PM_TRANS_FLAG_PRINTURIS)) { + _alpm_log(PM_LOG_WARNING, _("%s-%s is up to date -- skipping\n"), + alpm_pkg_get_name(local), alpm_pkg_get_version(local)); + } return(0); } else { - if(!(trans->flags & PM_TRANS_FLAG_DOWNLOADONLY)) { + if(!(trans->flags & (PM_TRANS_FLAG_DOWNLOADONLY | PM_TRANS_FLAG_PRINTURIS))) { _alpm_log(PM_LOG_WARNING, _("%s-%s is up to date -- reinstalling\n"), alpm_pkg_get_name(local), alpm_pkg_get_version(local)); } } - } + } /* else cmp == 1 - spkg is newer than local */ } /* add the package to the transaction */ -- 1.5.5.3

3 11

[pacman-dev] [PATCH] Move geninteg block in makepkg before error checking
by Allan McRae 10 Jun '08

10 Jun '08

This pactch moves the generating of integrity checks to before any error checking takes place in the PKGBUILD file. This allows integrity generation to complete when unrelated errors exist in a PKGBUILD file and allows the removal of multiple checks of the GENINTEG variable that would otherwise be needed. In addition a minor fix is made to a comment Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> --- scripts/makepkg.sh.in | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index cc44c68..38b22a5 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1187,8 +1187,7 @@ while true; do done if [ "$HOLDVER" = "1" -a "$FORCE_VER" != "" ]; then - # The extra '--' is here to prevent gettext from thinking --holdver is - # an option + # The '\\0' is here to prevent gettext from thinking --holdver is an option error "$(gettext "\\0--holdver and --forcever cannot both be specified" )" exit 1 fi @@ -1288,6 +1287,14 @@ fi source "$BUILDSCRIPT" +if [ "$GENINTEG" = "1" ]; then + mkdir -p "$srcdir" + cd "$srcdir" + download_sources + generate_checksums + exit 0 # $E_OK +fi + # check for no-no's in the build script if [ -z "$pkgname" ]; then error "$(gettext "%s is not allowed to be empty.")" "pkgname" @@ -1340,7 +1347,7 @@ devel_check devel_update if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \ - -a "$FORCE" = "0" -a "$GENINTEG" = "0" -a "$SOURCEONLY" = "0" ]; then + -a "$FORCE" = "0" -a "$SOURCEONLY" = "0" ]; then if [ "$INSTALL" = "1" ]; then warning "$(gettext "A package has already been built, installing existing package...")" install_package @@ -1386,11 +1393,11 @@ if [ "$SOURCEONLY" = "1" ]; then fi # fix flyspray bug #5973 -if [ "$NODEPS" = "1" -o "$GENINTEG" = "1" -o "$NOBUILD" = "1" -o "$REPKG" = "1" ]; then +if [ "$NODEPS" = "1" -o "$NOBUILD" = "1" -o "$REPKG" = "1" ]; then if [ "$NODEPS" = "1" ]; then warning "$(gettext "Skipping dependency checks.")" fi - # skip printing a warning message for the others: geninteg, nobuild, repkg + # skip printing a warning message for the others: nobuild, repkg elif [ $(type -p pacman) ]; then unset pkgdeps # Set by resolve_deps() and used by remove_deps() deperr=0 @@ -1416,12 +1423,6 @@ umask 0022 mkdir -p "$srcdir" cd "$srcdir" -if [ "$GENINTEG" = "1" ]; then - download_sources - generate_checksums - exit 0 # $E_OK -fi - if [ "$NOEXTRACT" = "1" -o "$REPKG" = "1" ]; then warning "$(gettext "Skipping source retrieval -- using existing src/ tree")" warning "$(gettext "Skipping source integrity checks -- using existing src/ tree")" -- 1.5.5.1

4 5

[pacman-dev] groups spanning multiple repositories
by Allan McRae 10 Jun '08

10 Jun '08

Is it possible to work around this? > pacman -S base :: group base (including ignored packages): filesystem libdownload mlocate :: Install whole content? [Y/n] Y :: group base (including ignored packages): acl attr bash binutils bzip2 coreutils cpio cracklib cryptsetup dash db dcron device-mapper dhcpcd dialog dmapi e2fsprogs file <snip> :: Install whole content? [Y/n] The first "base" group is from [testing] and the second is from [core]. I seem to recall seeing this discussed a long time ago but can't find it anywhere so I wanted to ask before I potentially wasted time looking into it. Allan

3 2

[pacman-dev] [PATCH] makepkg: add --allsource option
by Allan McRae 09 Jun '08

09 Jun '08

This supplements the --source option and does nearly the same thing, except downloaded source files are included in the archive as well. The sources are now packages with a pkgname/ prefix. Original work by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> --- scripts/makepkg.sh.in | 46 ++++++++++++++++++++++++++++++++++------------ 1 files changed, 34 insertions(+), 12 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 75db0c5..63187c0 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -921,14 +921,26 @@ create_xdelta() { create_srcpackage() { cd "$startdir" + if [ "$SOURCEONLY" = "2" ]; then + # get back to our src directory so we can begin with sources + mkdir -p "$srcdir" + cd "$srcdir" + download_sources + # we can only check checksums if we have all files + check_checksums + cd "$startdir" + fi msg "$(gettext "Creating source package...")" - local comp_files="$BUILDSCRIPT" + local srclinks="$(mktemp -d "$startdir"/srclinks.XXXXXXXXX)" + mkdir "${srclinks}"/${pkgname} + msg2 "$(gettext "Adding %s...")" "$BUILDSCRIPT" + ln -s "${startdir}/${BUILDSCRIPT}" "${srclinks}/${pkgname}/" if [ "$install" != "" ]; then if [ -f $install ]; then msg2 "$(gettext "Adding install script...")" - comp_files="$comp_files $install" + ln -s "${startdir}/$install" "${srclinks}/${pkgname}/" else error "$(gettext "Install script %s not found.")" "$install" fi @@ -936,14 +948,18 @@ create_srcpackage() { if [ -f ChangeLog ]; then msg2 "$(gettext "Adding %s...")" "ChangeLog" - comp_files="$comp_files ChangeLog" + ln -s "${startdir}/ChangeLog" "${srclinks}/${pkgname}" fi - local i - for i in ${source[@]}; do - if [ -f $i ]; then - msg2 "$(gettext "Adding %s...")" "$i" - comp_files="$comp_files $i" + local netfile + for netfile in ${source[@]}; do + local file=$(strip_url "$netfile") + if [ -f $netfile ]; then + msg2 "$(gettext "Adding %s...")" "$netfile" + ln -s $netfile ${srclinks}/${pkgname} + elif [ "$SOURCEONLY" = "2" -a -f "$SRCDEST/$file" ]; then + msg2 "$(gettext "Adding %s...")" "$file" + ln -s "$SRCDEST/$file" "${srclinks}/${pkgname}/" fi done @@ -951,10 +967,13 @@ create_srcpackage() { # tar it up msg2 "$(gettext "Compressing source package...")" - if ! bsdtar -czf "$pkg_file" $comp_files; then + cd ${srclinks} + if ! bsdtar -czLf "$pkg_file" ${pkgname}; then error "$(gettext "Failed to create source package file.")" exit 1 # TODO: error code fi + cd ${startdir} + rm -rf ${srclinks} } install_package() { @@ -1126,8 +1145,10 @@ SRCDEST=${SRCDEST:-$startdir} #default to $startdir if undefined # Parse Command Line Options. OPT_SHORT="AbcCdefFghiLmop:rRsSV" -OPT_LONG="ignorearch,asroot,builddeps,clean,cleancache,nodeps,noextract,force,forcever:,geninteg,help,holdver" -OPT_LONG="$OPT_LONG,install,log,nocolor,nobuild,rmdeps,repackage,source,syncdeps,usesudo,version" +OPT_LONG="allsource,asroot,ignorearch,builddeps,clean,cleancache,nodeps" +OPT_LONG="$OPT_LONG,noextract,force,forcever:,geninteg,help,holdver" +OPT_LONG="$OPT_LONG,install,log,nocolor,nobuild,rmdeps,repackage,source" +OPT_LONG="$OPT_LONG,syncdeps,usesudo,version" # Pacman Options OPT_LONG="$OPT_LONG,noconfirm,noprogressbar" OPT_TEMP="$(getopt -o "$OPT_SHORT" -l "$OPT_LONG" -n "$(basename "$0")" -- "$@" || echo 'GETOPT GO BANG!')" @@ -1145,6 +1166,7 @@ while true; do --noprogressbar) PACMAN_OPTS="$PACMAN_OPTS --noprogressbar" ;; # Makepkg Options + --allsource) SOURCEONLY=2 ;; --asroot) ASROOT=1 ;; -A|--ignorearch) IGNOREARCH=1 ;; -c|--clean) CLEANUP=1 ;; @@ -1381,7 +1403,7 @@ if [ $EUID -eq 0 ]; then fi # if we are creating a source-only package, go no further -if [ "$SOURCEONLY" = "1" ]; then +if [ "$SOURCEONLY" != "0" ]; then if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}${SRCEXT}" \ -a "$FORCE" = "0" ]; then error "$(gettext "A package has already been built. (use -f to overwrite)")" -- 1.5.5.3

3 2

[pacman-dev] [PATCH] Reformat -Sg output to look like -Qg
by Dan McGee 06 Jun '08

06 Jun '08

We used list_display() on -Sg output, which might have been slightly nicer looking but made it much harder to parse in something like a shell script. Reformat it in the 'grpname pkgname' format that -Qg is already using. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/sync.c | 25 ++++++++++--------------- 1 files changed, 10 insertions(+), 15 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 923394c..47ab4eb 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -346,25 +346,20 @@ static int sync_search(alpm_list_t *syncs, alpm_list_t *targets) static int sync_group(int level, alpm_list_t *syncs, alpm_list_t *targets) { alpm_list_t *i, *j, *k; - alpm_list_t *pkgnames = NULL; if(targets) { for(i = targets; i; i = alpm_list_next(i)) { - char *grpname = alpm_list_getdata(i); + const char *grpname = alpm_list_getdata(i); for(j = syncs; j; j = alpm_list_next(j)) { pmdb_t *db = alpm_list_getdata(j); pmgrp_t *grp = alpm_db_readgrp(db, grpname); if(grp) { - printf("%s\n", alpm_grp_get_name(grp)); /* get names of packages in group */ for(k = alpm_grp_get_pkgs(grp); k; k = alpm_list_next(k)) { - pkgnames = alpm_list_add(pkgnames, - (char*)alpm_pkg_get_name(k->data)); + printf("%s %s\n", grpname, + alpm_pkg_get_name(alpm_list_getdata(k))); } - list_display(" ", pkgnames); - alpm_list_free(pkgnames); - pkgnames = NULL; } } } @@ -374,16 +369,16 @@ static int sync_group(int level, alpm_list_t *syncs, alpm_list_t *targets) for(j = alpm_db_getgrpcache(db); j; j = alpm_list_next(j)) { pmgrp_t *grp = alpm_list_getdata(j); + const char *grpname = alpm_grp_get_name(grp); - printf("%s\n", alpm_grp_get_name(grp)); - if(grp && level > 1) { + if(level > 1) { for(k = alpm_grp_get_pkgs(grp); k; k = alpm_list_next(k)) { - pkgnames = alpm_list_add(pkgnames, - (char*)alpm_pkg_get_name(k->data)); + printf("%s %s\n", grpname, + alpm_pkg_get_name(alpm_list_getdata(k))); } - list_display(" ", pkgnames); - alpm_list_free(pkgnames); - pkgnames = NULL; + } else { + /* print grp names only, no package names */ + printf("%s\n", grpname); } } } -- 1.5.5.3

2 2

[pacman-dev] [PATCH] bacman - regenerate package from system
by Allan McRae 06 Jun '08

06 Jun '08

Original work by Carlo "carlocci" Bersani with additions by Xavier Chantry and Allan McRae This script rebuilds an already installed package using metadata stored into the pacman database and system files. Replaces the outdated re-pacman script Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> --- contrib/README | 2 +- contrib/bacman | 282 +++++++++++++++++++++++++++++++++++++++++++++++++++++ contrib/re-pacman | 77 --------------- 3 files changed, 283 insertions(+), 78 deletions(-) create mode 100755 contrib/bacman delete mode 100755 contrib/re-pacman diff --git a/contrib/README b/contrib/README index 73dbade..5ce7ca4 100644 --- a/contrib/README +++ b/contrib/README @@ -20,7 +20,7 @@ pacsearch - a colorized search combining both -Ss and -Qs output. Installed packages are easily identified with a *** and local-only packages are also listed. -re-pacman - regenerate a pacman package based on installed files and the pacman +bacman - regenerate a pacman package based on installed files and the pacman database entries. Useful for reuse, or possible config file extension. vimprojects - a project file for the vim project plugin. diff --git a/contrib/bacman b/contrib/bacman new file mode 100755 index 0000000..410482f --- /dev/null +++ b/contrib/bacman @@ -0,0 +1,282 @@ +#!/bin/bash +# +# bacman: recreate a package from a running system +# This script rebuilds an already installed package using metadata +# stored into the pacman database and system files +# +# (c) 2008 - locci <carlocci_at_gmail_dot_com> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +readonly progname="bacman" +readonly progver="0.2.0" + +# +# User Friendliness +# +function usage(){ + echo "This program recreates a package using pacman's db and system files" + echo "Usage: $progname <installed package name>" + echo "Example: $progname kernel26" +} + +if [ $# -ne 1 ] ; then + usage + exit 1 +fi + +if [ "$1" = "--help" -o "$1" = "-h" ] ; then + usage + exit 0 +fi + +if [ "$1" = "--version" -o "$1" = "-v" ]; then + echo "$progname version $progver" + echo "Copyright (C) 2008 locci" + exit 0 +fi + +# +# Fakeroot support +# +if [ $EUID -gt 0 ]; then + if [ -f /usr/bin/fakeroot ]; then + echo "Entering fakeroot environment" + export INFAKEROOT="1" + /usr/bin/fakeroot -u -- $0 $1 + exit $? + else + echo "WARNING: installing fakeroot or running ${progname} as root is required to" + echo " preserve the ownership permissions of files in some packages" + echo "" + fi +fi + +# +# Setting environmental variables +# +if [ ! -r /etc/pacman.conf ]; then + echo "ERROR: unable to read /etc/pacman.conf" + exit 1 +fi + +eval $(awk '/DBPath/ {print $1$2$3}' /etc/pacman.conf) +pac_db="${DBPath:-/var/lib/pacman/}/local" + +if [ ! -r /etc/makepkg.conf ]; then + echo "ERROR: unable to read /etc/makepkg.conf" + exit 1 +fi + +source "/etc/makepkg.conf" +if [ -r ~/.makepkg.conf ]; then + source ~/.makepkg.conf +fi + +pkg_arch=${CARCH:-'unknown'} +pkg_dest="${PKGDEST:-$PWD}" +pkg_pkger=${PACKAGER:-'Unknown Packager'} + +pkg_name="$1" +pkg_dir="$(echo $pac_db/$pkg_name-[0-9]*)" +pkg_namver="${pkg_dir##*/}" + +# +# Checks everything is in place +# +if [ ! -d "$pac_db" ] ; then + echo "ERROR: pacman database directory ${pac_db} not found" + exit 1 +fi + +if [ ! -d "$pkg_dir" ] ; then + echo "ERROR: package ${pkg_name} not found in pacman database" + exit 1 +fi + +# +# Begin +# +echo Package: ${pkg_namver} +work_dir=$(mktemp -d -p /tmp) +cd $work_dir || exit 1 + +# +# File copying +# +echo "Copying package files..." + +cat "$pkg_dir"/files | +while read i; do + if [ -z "$i" ] ; then + continue + fi + + if [[ "$i" =~ %[A-Z]*% ]] ; then + current=$i + continue + fi + + case $current in + %FILES%) + ret=0 + if [ -e "/$i" ]; then + bsdtar -cnf - "/$i" 2> /dev/null | bsdtar -xpf - + + # Workaround to bsdtar not reporting a missing file as an error + if [ ! -e "$work_dir"/"$i" ]; then + echo "" + echo "ERROR: unable to add /$i to the package" + echo " If your user does not have permssion to read this file then" + echo " you will need to run $progname as root" + rm -rf $work_dir + exit 1 + fi + else + echo "" + echo "WARNING: package file /$i is missing" + echo "" + fi + + + ;; + esac +done + +ret=$? +if [ $ret -ne 0 ]; then + rm -rf $work_dir + exit 1 +fi + +pkg_size=$(du -sk | awk '{print $1 * 1024}') + +if [ -f "$pkg_dir/install" ] ; then + cp "$pkg_dir/install" "$work_dir/.INSTALL" +fi +if [ -f $pkg_dir/changelog ] ; then + cp "$pkg_dir/changelog" "$work_dir/.CHANGELOG" +fi + +# +# .PKGINFO stuff +# +echo Generating .PKGINFO metadata... +echo "# Generated by $progname $progver" > .PKGINFO +if [ "$INFAKEROOT" = "1" ]; then + echo "# Using $(fakeroot -v)" >> .PKGINFO +fi +echo "# $(LC_ALL=C date)" >> .PKGINFO +echo "#" >> .PKGINFO + +cat "$pkg_dir"/{desc,files,depends} | +while read i; do + if [[ -z "$i" ]]; then + continue; + fi + + if [[ "$i" =~ %[A-Z]*% ]] ; then + current=$i + continue + fi + + case "$current" in + # desc + %NAME%) + echo "pkgname = $i" >> .PKGINFO + ;; + %VERSION%) + echo "pkgver = $i" >> .PKGINFO + ;; + %DESC%) + echo "pkgdesc = $i" >> .PKGINFO + ;; + %URL%) + echo "url = $i" >> .PKGINFO + ;; + %LICENSE%) + echo "license = $i" >> .PKGINFO + ;; + %ARCH%) + echo "arch = $i" >> .PKGINFO + ;; + %BUILDDATE%) + echo "builddate = $(date -u "+%s")" >> .PKGINFO + ;; + %PACKAGER%) + echo "packager = $pkg_pkger" >> .PKGINFO + ;; + %SIZE%) + echo "size = $pkg_size" >> .PKGINFO + ;; + %GROUPS%) + echo "group = $i" >> .PKGINFO + ;; + %REPLACES%) + echo "replaces = $i" >> .PKGINFO + ;; + %FORCE%) + echo "force = true" >> .PKGINFO + ;; + + # files + %BACKUP%) + # strip the md5sum after the tab + echo "backup = ${i%%$'\t'*}" >> .PKGINFO + ;; + + # depends + %DEPENDS%) + echo "depend = $i" >> .PKGINFO + ;; + %OPTDEPENDS%) + echo "optdepend = $i" >> .PKGINFO + ;; + %CONFLICTS%) + echo "conflict = $i" >> .PKGINFO + ;; + %PROVIDES%) + echo "provides = $i" >> .PKGINFO + ;; + esac +done + +# +# Fixes owner:group and permissions for .PKGINFO, .CHANGELOG, .INSTALL +# +chown root:root $work_dir/{.PKGINFO,.CHANGELOG,.INSTALL} 2> /dev/null +chmod 644 $work_dir/{.PKGINFO,.CHANGELOG,.INSTALL} 2> /dev/null + +# +# Generate the package +# +echo "Generating the package..." + +ret=0 +bsdtar -czf "$pkg_dest/$pkg_namver-$pkg_arch.tar.gz" $(ls -A) || ret=$? +if [ $ret -ne 0 ]; then + echo "ERROR: unable to write package to $pkg_dest" + echo " Maybe the disk is full or you do not have write access" + rm -rf $work_dir + exit 1 +fi + +rm -rf $work_dir + +echo Done + +exit 0 + +# vim: set ts=2 sw=2 noet: \ No newline at end of file diff --git a/contrib/re-pacman b/contrib/re-pacman deleted file mode 100755 index fff1c87..0000000 --- a/contrib/re-pacman +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/sh -# -# re-pacman: regenerate a pacman package based on installed files and the -# pacman database entries. Useful for reuse, or possible config file -# extension -# -# Copyright (c) 2006 Aaron Griffin <aaron(a)archlinux.org> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# - -#TODO -# * Check for md5 changes in backup lines and change pkgrel - -pacinfo () { - [ $# -ne 2 ] && return 1 - #use echo to strip spaces - echo $(pacman -Qi ${1} | grep "${2}" | cut -d: -f2-) -} - -make_pkginfo () { - echo "# Generated by re-pacman 1.0.0" - echo "# On $(date)" - echo "pkgname =$(pacinfo ${1} Name)" - echo "pkgver =$(pacinfo ${1} Version)" - echo "pkgdesc =$(pacinfo ${1} Description)" - echo "url =$(pacinfo ${1} URL)" - echo "builddate =$(pacinfo ${1} 'Build Date')" - echo "packager =$(pacinfo ${1} Packager)" - echo "size =$(pacinfo ${1} Size)" - echo "arch =$(pacinfo ${1} Architecture)" - deps=$(pacinfo ${1} 'Depends On') - for d in ${deps}; do - echo "depend = ${d}" - done -} - -LANG="POSIX" - -if [ $# -ne 1 ]; then - echo "usage: re-pacman <installed package name>" - exit 1 -fi - -ver=$(pacinfo ${1} Version) -if [ "x${ver}" = "x" ]; then - echo "Package '${1}' not found, aborting." - exit 1 -fi - -echo ":: Cleaning up old files" -rm -f .PKGINFO "${1}-${ver}.pkg.tar.gz" - -echo ":: Building PKGINFO" -make_pkginfo ${1} > .PKGINFO - -flist=".PKGINFO" -flist="${flist} $(pacman -Ql ${1} | sed 's|\w* $.*$|/\1|g' | grep -v '/$')" - -echo ":: Building final package tarball" -echo ${flist} | tr ' ' '\n' | tar czf "${1}-${ver}.pkg.tar.gz" -T - 2>/dev/null - -rm -f .PKGINFO -echo ":: Package '${1}-${ver}.pkg.tar.gz' is now ready for installation" - -# vim: set ts=2 sw=2 noet: -- 1.5.5.3

2 1

[pacman-dev] [PATCH] bacman - regenerate package from system
by Allan McRae 06 Jun '08

06 Jun '08

Original work by Carlo "carlocci" Bersani with additions by Xavier Chantry and Allan McRae This script rebuilds an already installed package using metadata stored into the pacman database and system files. Replaces the outdated re-pacman script Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> --- contrib/README | 2 +- contrib/bacman | 249 +++++++++++++++++++++++++++++++++++++++++++++++++++++ contrib/re-pacman | 77 ---------------- 3 files changed, 250 insertions(+), 78 deletions(-) create mode 100755 contrib/bacman delete mode 100755 contrib/re-pacman diff --git a/contrib/README b/contrib/README index 73dbade..5ce7ca4 100644 --- a/contrib/README +++ b/contrib/README @@ -20,7 +20,7 @@ pacsearch - a colorized search combining both -Ss and -Qs output. Installed packages are easily identified with a *** and local-only packages are also listed. -re-pacman - regenerate a pacman package based on installed files and the pacman +bacman - regenerate a pacman package based on installed files and the pacman database entries. Useful for reuse, or possible config file extension. vimprojects - a project file for the vim project plugin. diff --git a/contrib/bacman b/contrib/bacman new file mode 100755 index 0000000..ba124ed --- /dev/null +++ b/contrib/bacman @@ -0,0 +1,249 @@ +#!/bin/bash +# +# bacman: recreate a package from a running system +# This script rebuilds an already installed package using metadata +# stored into the pacman database and system files +# +# (c) 2008 - locci <carlocci_at_gmail_dot_com> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +readonly progname="bacman" +readonly progver="0.1.2" + +# +# User Friendliness +# +function usage(){ + echo "This program recreates a package using pacman's db and system files" + echo "Usage: $progname <installed package name>" + echo "Example: $progname kernel26" +} + +if [ $# -ne 1 ] ; then + usage + exit 1 +fi + +if [ "$1" = "--help" -o "$1" = "-h" ] ; then + usage + exit 0 +fi + +if [ "$1" = "--version" -o "$1" = "-v" ]; then + echo "$progname version $version" + echo "Copyright (C) 2008 locci" + exit 0 +fi + +# +# Setting environmental variables +# +if [ ! -r /etc/pacman.conf ]; then + echo Error: unable to read /etc/pacman.conf + exit 1 +fi + +eval $(awk '/DBPath/ {print $1$2$3}' /etc/pacman.conf) +pac_db="${DBPath:-/var/lib/pacman/}/local" + +if [ ! -r /etc/makepkg.conf ]; then + echo Error: unable to read /etc/makepkg.conf + exit 1 +fi + +source "/etc/makepkg.conf" +if [ -r ~/.makepkg.conf ]; then + source ~/.makepkg.conf +fi + +pkg_arch=${CARCH:-'unknown'} +pkg_dest="${PKGDEST:-$PWD}" +pkg_pkger=${PACKAGER:-'Unknown Packager'} + +pkg_name="$1" +pkg_dir="$(echo $pac_db/$pkg_name-[0-9]*)" +pkg_namver="${pkg_dir##*/}" + +# +# Checks everything is in place +# +if [ ! -d "$pac_db" ] ; then + echo Error: pacman database directory ${pac_db} not found + exit 1 +fi + +if [ ! -d "$pkg_dir" ] ; then + echo Error: package ${pkg_name} not found in pacman database + exit 1 +fi + +# +# Begin +# +echo Package: ${pkg_namver} +work_dir=$(mktemp -d -p /tmp) +cd $work_dir || exit 1 + +# +# File copying +# +echo Copying package files... + +cat "$pkg_dir"/files | +while read i; do + if [ -z "$i" ] ; then + continue + fi + + if [[ "$i" =~ %[A-Z]*% ]] ; then + current=$i + continue + fi + + case $current in + %FILES%) + ret=0 + if [ -d "/$i" ]; then + mkdir "$i" || ret=$? + elif [ -f "/$i" ]; then + cp -dp "/$i" "$i" || ret=$? + else + echo "/$i" is missing: this might result in a broken package + fi + + if [ $ret -ne 0 ]; then + echo Error: unable to create /$i + exit 1 + fi + ;; + esac +done + +ret=$? +if [ $ret -ne 0 ]; then + rm -rf $work_dir + exit 1 +fi + +pkg_size=$(du -sk | awk '{print $1 * 1024}') + +if [ -f "$pkg_dir/install" ] ; then + cp "$pkg_dir/install" "$work_dir/.INSTALL" +fi +if [ -f $pkg_dir/changelog ] ; then + cp "$pkg_dir/changelog" "$work_dir/.CHANGELOG" +fi + +# +# .PKGINFO stuff +# +echo Generating .PKGINFO metadata... +echo "# Generated by $progname $progver" > .PKGINFO +echo "# $(LC_ALL=C date)" >> .PKGINFO +echo "#" >> .PKGINFO + +cat "$pkg_dir"/{desc,files,depends} | +while read i; do + if [[ -z "$i" ]]; then + continue; + fi + + if [[ "$i" =~ %[A-Z]*% ]] ; then + current=$i + continue + fi + + case "$current" in + # desc + %NAME%) + echo "pkgname = $i" >> .PKGINFO + ;; + %VERSION%) + echo "pkgver = $i" >> .PKGINFO + ;; + %DESC%) + echo "pkgdesc = $i" >> .PKGINFO + ;; + %URL%) + echo "url = $i" >> .PKGINFO + ;; + %LICENSE%) + echo "license = $i" >> .PKGINFO + ;; + %ARCH%) + echo "arch = $i" >> .PKGINFO + ;; + %BUILDDATE%) + echo "builddate = $(date -u "+%s")" >> .PKGINFO + ;; + %PACKAGER%) + echo "packager = $pkg_pkger" >> .PKGINFO + ;; + %SIZE%) + echo "size = $pkg_size" >> .PKGINFO + ;; + %GROUPS%) + echo "group = $i" >> .PKGINFO + ;; + %REPLACES%) + echo "replaces = $i" >> .PKGINFO + ;; + %FORCE%) + echo "force = true" >> .PKGINFO + ;; + + # files + %BACKUP%) + # strip the md5sum after the tab + echo "backup = ${i%% *}" >> .PKGINFO + ;; + + # depends + %DEPENDS%) + echo "depend = $i" >> .PKGINFO + ;; + %OPTDEPENDS%) + echo "optdepend = $i" >> .PKGINFO + ;; + %CONFLICTS%) + echo "conflict = $i" >> .PKGINFO + ;; + %PROVIDES%) + echo "provides = $i" >> .PKGINFO + ;; + esac +done + +# +# Generate the package +# +echo Generating the package... + +ret=0 +bsdtar -czf "$pkg_dest/$pkg_namver-$pkg_arch.tar.gz" $(ls -A) || ret=$? +if [ $ret -ne 0 ]; then + echo Error: unable to write package to $pkg_dest + echo Maybe the disk is full or you do not have write access + exit 1 +fi + +rm -rf $work_dir + +echo Done + +exit 0 + +# vim: set ts=2 sw=2 noet: \ No newline at end of file diff --git a/contrib/re-pacman b/contrib/re-pacman deleted file mode 100755 index fff1c87..0000000 --- a/contrib/re-pacman +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/sh -# -# re-pacman: regenerate a pacman package based on installed files and the -# pacman database entries. Useful for reuse, or possible config file -# extension -# -# Copyright (c) 2006 Aaron Griffin <aaron(a)archlinux.org> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# - -#TODO -# * Check for md5 changes in backup lines and change pkgrel - -pacinfo () { - [ $# -ne 2 ] && return 1 - #use echo to strip spaces - echo $(pacman -Qi ${1} | grep "${2}" | cut -d: -f2-) -} - -make_pkginfo () { - echo "# Generated by re-pacman 1.0.0" - echo "# On $(date)" - echo "pkgname =$(pacinfo ${1} Name)" - echo "pkgver =$(pacinfo ${1} Version)" - echo "pkgdesc =$(pacinfo ${1} Description)" - echo "url =$(pacinfo ${1} URL)" - echo "builddate =$(pacinfo ${1} 'Build Date')" - echo "packager =$(pacinfo ${1} Packager)" - echo "size =$(pacinfo ${1} Size)" - echo "arch =$(pacinfo ${1} Architecture)" - deps=$(pacinfo ${1} 'Depends On') - for d in ${deps}; do - echo "depend = ${d}" - done -} - -LANG="POSIX" - -if [ $# -ne 1 ]; then - echo "usage: re-pacman <installed package name>" - exit 1 -fi - -ver=$(pacinfo ${1} Version) -if [ "x${ver}" = "x" ]; then - echo "Package '${1}' not found, aborting." - exit 1 -fi - -echo ":: Cleaning up old files" -rm -f .PKGINFO "${1}-${ver}.pkg.tar.gz" - -echo ":: Building PKGINFO" -make_pkginfo ${1} > .PKGINFO - -flist=".PKGINFO" -flist="${flist} $(pacman -Ql ${1} | sed 's|\w* $.*$|/\1|g' | grep -v '/$')" - -echo ":: Building final package tarball" -echo ${flist} | tr ' ' '\n' | tar czf "${1}-${ver}.pkg.tar.gz" -T - 2>/dev/null - -rm -f .PKGINFO -echo ":: Package '${1}-${ver}.pkg.tar.gz' is now ready for installation" - -# vim: set ts=2 sw=2 noet: -- 1.5.5.3

2 6

[pacman-dev] #10530: checksum verification does not work on BSD
by Sebastian Nowicki 06 Jun '08

06 Jun '08

I don't really like this solution, but it's the only portable solution I could think of. Instead of using md5sum, sha1sum, etc from GNU coreutils, openssl is used. Openssl has the limitation that it does not support the other sha* algorithms, so they had to be removed from makepkg. I don't like having to remove features in order to make something more portable. The patch has been tested on Mac OSX (10.5) and Archlinux. References http://bugs.archlinux.org/task/10530 doc/makepkg.conf.5.txt | 2 +- etc/makepkg.conf.in | 2 +- scripts/makepkg.sh.in | 9 ++++----- 3 files changed, 6 insertions(+), 7 deletions(-)

7 23

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.1.4-13-g4a80283
by Dan McGee 05 Jun '08

05 Jun '08

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via 4a802838cb2e2d1eca4c4e07b31a923dc29bd1e3 (commit) from 398d4aff2dc25585e51310ba2f7f8d64a9f52081 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4a802838cb2e2d1eca4c4e07b31a923dc29bd1e3 Author: Anton Fiuman <llexiw(a)gmail.com> Date: Mon Jun 2 06:41:52 2008 +0200 Don't require --force when using the --nobuild option makepkg should not abort with error when a user uses the --nobuild option to extract sources if a package has already been built. Signed-off-by: Anton Fiuman <llexiw(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.1.4-192-g5ae02e6
by Dan McGee 05 Jun '08

05 Jun '08

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 5ae02e6ae72b7648318e319eba9ab02f489d858a (commit) via d030d12542dabfe0b6c648f48d2ff08b4feb4d41 (commit) via 0966c33a72ce172526762ac988ee6edbbba07b52 (commit) via fe781e4ce4ace4410bbc8bec441140cfc323d262 (commit) via 0669c9bfac7aead01f1400444e691d542f7645c2 (commit) via 62b4195c7680f9d404e175eb0869182efdd09ef2 (commit) via 5f0692def87b5c15d2ad6606e95c9139187a8132 (commit) via 636610432a8dc633812d323d3e85b639aabb3302 (commit) from 54e1e3e642d834d8c676db7f74e95c6e24b19eab (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5ae02e6ae72b7648318e319eba9ab02f489d858a Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed May 28 23:25:40 2008 +0200 Don't display filename on -Qip operation. Some previous commits apparently broke the get_filename function for package loaded with pkg_load (on a -Qip operation) because this field was no longer filled. Now pkg_load fills it. But the -Qip operation needs to be run like this : -Qip <filename>, so the filename is already known. There is no need to display it again. Besides, on a normal -Qi operation, the filename is not displayed either because this information is not stored in the local database. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d030d12542dabfe0b6c648f48d2ff08b4feb4d41 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed May 28 22:55:03 2008 +0200 src/pacman/sync.c : cleanup of pacman_sync By putting the search / group / info / list operations just after the -Sy op, we can simplify several checks : 1) the check for "missing targets". Since we took care of the above operations, we now have less cases to consider : * -Syu or -Su : we can proceed * -Sy : we can end now (this is actually a bugfix) * -S : this op requires targets, so exit with an error 2) the check to see if a transaction is needed. If we arrive at the end of the function, it is either because we have -Su or -S <targets> so we already know a transaction is needed there. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0966c33a72ce172526762ac988ee6edbbba07b52 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Fri May 30 08:52:27 2008 +0200 Get rid of double / in database paths. Errors like the following one happen regularly (for unknown reasons...) : error: could not open file /var/lib/pacman/local//glibc-2.7-9/depends: No such file or directory Anyway, every time an user reported an error like that, it always seemed like he thought the error was caused by the double /, which is obviously wrong. Since db->path always include a trailing /, there is no need to add one when concatenating paths in be_files.c or add.c. Additionally, some static strings were switched to dynamic. And the computation of the "dbpath"/"pkgname"-"pkgversion" was refactored in db_read, db_write and db_remove with a get_pkgpath static function. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fe781e4ce4ace4410bbc8bec441140cfc323d262 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jun 1 23:10:30 2008 -0500 Reimplement TotalDownload functionality Add a new totaldlcb callback function to libalpm and make pacman utilize it when the TotalDownload option is enabled. This callback function is pretty simple- it is meant to be called once at the beginning of a "list download" action, and once at the end (with value 0 to indicate the list has been finished). The frontend is responsible for keeping track of adding individual file download amounts to the total xfered amount in order to display some sort of overall progress. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0669c9bfac7aead01f1400444e691d542f7645c2 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jun 1 21:47:31 2008 -0500 Use correct C type for file sizes We have been using unsigned long as a file size type for a while, which works but isn't quite correct and could easily break. Worse was probably our use of int in the download callback functions, which could be restrictive for packages > 2GB in size. Switch all file size variables to use off_t, which is the preferred type for file sizes. Note that at least on Linux, all applications compiled against libalpm must now be sure to use large file support, where _FILE_OFFSET_BITS is defined to be 64 or there will be some weird issues that crop up. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 62b4195c7680f9d404e175eb0869182efdd09ef2 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jun 2 15:14:37 2008 -0500 libalpm/md5: Fix license header This was mistakenly referencing the LGPL even after the XySSL code bump, so fix the license clause to be correct. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5f0692def87b5c15d2ad6606e95c9139187a8132 Author: Dan McGee <dan(a)archlinux.org> Date: Fri May 30 19:32:28 2008 -0500 makepkg: remove some dead TODO code Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 636610432a8dc633812d323d3e85b639aabb3302 Author: Dan McGee <dan(a)archlinux.org> Date: Sat May 31 11:53:51 2008 -0500 Allow GIT version to be used in pacman builds Add a new configure flag, --enable-git-version, that allows the output of 'git describe' to be used in the version string associated with this package. This could aid in debugging for users that are using a development version of pacman and we should be able to figure out which cut of code they are using. Sample output: $ pacman --version Pacman v3.1.4-190-g4cfa-dirty - libalpm v2.3.1 $ makepkg --version makepkg (pacman) 3.1.4-190-g5861-dirty Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 47 +++++++++++++++------- lib/libalpm/add.c | 18 ++++++--- lib/libalpm/alpm.h | 20 ++++++---- lib/libalpm/be_files.c | 100 ++++++++++++++++++++++++++++++---------------- lib/libalpm/be_package.c | 9 +++- lib/libalpm/db.c | 1 - lib/libalpm/delta.c | 16 ++++---- lib/libalpm/delta.h | 8 ++- lib/libalpm/dload.c | 6 +- lib/libalpm/graph.h | 4 +- lib/libalpm/handle.c | 18 ++++++++ lib/libalpm/handle.h | 1 + lib/libalpm/md5.c | 5 +- lib/libalpm/md5.h | 5 +- lib/libalpm/package.c | 4 +- lib/libalpm/package.h | 11 +++-- lib/libalpm/sync.c | 33 ++++++++++++--- scripts/Makefile.am | 9 ++++- scripts/makepkg.sh.in | 7 --- src/pacman/Makefile.am | 5 ++ src/pacman/callback.c | 81 ++++++++++++++++++++++++++++--------- src/pacman/callback.h | 6 ++- src/pacman/package.c | 3 - src/pacman/pacman.c | 11 +++++ src/pacman/sync.c | 76 +++++++++++++++++------------------ src/pacman/util.c | 2 +- 26 files changed, 332 insertions(+), 174 deletions(-) hooks/post-receive -- The official pacman repository

1 0