- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.2.1-22-ga1f7c83
by dan＠archlinux.org 03 Dec '08

03 Dec '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 a1f7c83dbf3bce492163362d2896e3a4176be616 (commit) via 6d8a6aef094c162f46a8b9be6a118a502fabca61 (commit) via b99bebc008dcf944a88f99bb44ac9029557e4149 (commit) from a50b067470a8046dabdff66f6266d2208b2f8372 (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: PKGBUILD.proto | 1 + lib/libalpm/be_files.c | 5 ++++- lib/libalpm/delta.c | 15 +++++++++++++++ src/pacman/callback.c | 1 + 4 files changed, 21 insertions(+), 1 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.1-52-g61c6552
by dan＠archlinux.org 03 Dec '08

03 Dec '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 61c6552862345cb155903cd1566f1cef5c527a94 (commit) via a1f7c83dbf3bce492163362d2896e3a4176be616 (commit) via 6d8a6aef094c162f46a8b9be6a118a502fabca61 (commit) via b99bebc008dcf944a88f99bb44ac9029557e4149 (commit) via a50b067470a8046dabdff66f6266d2208b2f8372 (commit) via 346139298bc547d1cbeb5d41f2067577b96ff1fa (commit) via f7192b595881103f145a118d63d1b342ffd740b4 (commit) from 9394f229a0328228e810b7d4588b24643b42df6a (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 61c6552862345cb155903cd1566f1cef5c527a94 Merge: 9394f229a0328228e810b7d4588b24643b42df6a a1f7c83dbf3bce492163362d2896e3a4176be616 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Dec 2 22:15:02 2008 -0600 Merge branch 'maint' Conflicts: lib/libalpm/dload.c ----------------------------------------------------------------------- Summary of changes: PKGBUILD.proto | 1 + lib/libalpm/be_files.c | 11 +++++++---- lib/libalpm/delta.c | 15 +++++++++++++++ lib/libalpm/dload.c | 10 ++++------ scripts/makepkg.sh.in | 2 +- src/pacman/callback.c | 1 + src/pacman/pacman.c | 46 ++++++++++++++++++++++++++++++++++------------ src/pacman/sync.c | 3 ++- 8 files changed, 65 insertions(+), 24 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Add optdepends to PKGBUILD.proto
by Allan McRae 03 Dec '08

03 Dec '08

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- PKGBUILD.proto | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/PKGBUILD.proto b/PKGBUILD.proto index 3265530..eddcf75 100644 --- a/PKGBUILD.proto +++ b/PKGBUILD.proto @@ -14,6 +14,7 @@ license=('GPL') groups=() depends=() makedepends=() +optdepends=() provides=() conflicts=() replaces=() -- 1.6.0.4

2 1

[pacman-dev] Package/database signing
by Gerhard Brauer 02 Dec '08

02 Dec '08

(I hope i don't triple-post this mail, sorry) Hi, i took this mail from arch-dev-public and arch-general discussion about "Can we trust our mirrors" Am Mon, 1 Dec 2008 11:06:02 -0600 schrieb "Aaron Griffin" <aaronmgriffin(a)gmail.com>: > > There's too much talk on this idea. Before we go ahead and do this, > could someone submit this patch to the pacman-dev list, so the pacman > developers can give it a once-over. Just make sure to let them know > that this is a temporary solution. I attach my patch to repo-add and a pacman download script to explain how things *could* be done. A proof of concept, working and tested on my local repo. > Additionally - where will gpg get the key from on gerolde? Shouldn't > this be configurable, or even set via an optarg to the -s param? In my environment the signing key is getting from my sec-keyring, cause i start repo-add under my UID. It's the default key in gpg.conf if you have more than one key. And of cource: on gpg command line the key could be selected by several criteria, also from a special keyring. Keyring or keys must kept secure of cource, so mostly the are in $HOME/.gpg This is only a concept for signing the package db for the repos. These database files are created only on gerolde (?) an should be signed only there and from the process which creates the database. This is repo-add. #Q: Which key, where does it come from, how to prevent this key(s)? I would assume only one secret key for database signing. AFAIK from Pierre repo-add is under normal procedures not called directly by the developers, only from upload/build scripts. So one solution maybe: create a dedicated user. repo-add then is running *only* under this UID. The secret key could be in the $HOME of this user, so it's secured from other access. Only god mode users on gerolde could "see" it, and maintain it (revoke, renew, etc.). In the scripts which called repo-add (or if single users must call repo-add directly) we could call it with su or sudo. Without special key selecting then the key is took from $repo-add-userid's keyring and cause it's the only keys it is automatically the default key. #Q: How to implement this in pacman on users side? In my test i use the pacman.conf option XferCommand and a special download script for. I call it like this: XferCommand = /tmp/pacsigdl %o %u Each download is checked if this is a *.db.tar,gz. If yes, the file is verified with the public key part from above. If verification is ok then pacman continues with this db file as usual, if verification failed pacman ignores the downloaded (corrupted) file and signals this for this special repo db (but continues with the rest of a -Syu). No new database for a repo -> no new packages to download/install. That way with XferCommand is not a real solution: a) It makes pacman intern downloading (libalpm) obsolete. b) Downloads for *all** packages(incl. database files) must be handled with wget or curl, which produces verbose or zero output which breaks our normal pacman output. c) The verifying part should not be delegated to the user. Ideally pacman would handle this process itself. (I'm nor a c programmer). #Q: Must we real use gpg command line? Must we use gpg? My experience with other Trust-Solutions are low. Also it seems that there are no good libraries to gpg for accessing functions from c programs. http://www.gnupg.org/related_software/libraries.en.html Thomas(brain0) mentions for ex. gnutls or openssl If we could integrate gpg (command-line or by lib) better in our framework then i think: gpg is a good, well known solution. #Q: Signing only the database is not secure! Yes, it would currently only secure our package hash/checksum functions against manipulations, not the packages itself. But IMHO it's a good starting point to get forward. Ideally we must sign the db files also when we sometimes have a super dupper package signing framework ;-) So let's start (and gain experience) fist with the db files. Currently our check-sums(md5) are only download check-sums. They could be manipulate (and therefor easily the corresponding package) on each station after the db leaves gerolde. From a secure view the checksums are useless. If we sign our db file we secure the checksums against manipulating. Not the packages itself. But package manipulating is a lot more difficult to do as in our current situation. And we could switch to a better package check summing solution than md5sum to gain more secure against package manipulation. Ideally we come some day to a framework were also the packages are signed by packagers/developers. Some days. Next step. That are my thoughts on this thing. Surely not complete. (Sorry for my not good English ;-) I attach also a tar archive with a) a repo-add patch and b) a download script for using in pacman.conf) Regards Gerhard

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.2.1-19-ga50b067
by dan＠archlinux.org 30 Nov '08

30 Nov '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 a50b067470a8046dabdff66f6266d2208b2f8372 (commit) from 346139298bc547d1cbeb5d41f2067577b96ff1fa (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 a50b067470a8046dabdff66f6266d2208b2f8372 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Mon Nov 17 17:02:43 2008 +0100 Give an error message on alpm_db_register_sync() error This patch slightly modifies pacman.c/_parseconfig(): See FS#12148. Now pacman prints the following error message in that case: "error: could not register 'unstable' database (could not open database)" I also added an error message for alpm_db_setserver() error. I changed the "return(1);" scheme to "ret = 1; goto cleanup;" to make sure that we free allocated memory and close open files. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: src/pacman/pacman.c | 46 ++++++++++++++++++++++++++++++++++------------ 1 files changed, 34 insertions(+), 12 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.2.1-18-g3461392
by dan＠archlinux.org 30 Nov '08

30 Nov '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 346139298bc547d1cbeb5d41f2067577b96ff1fa (commit) via f7192b595881103f145a118d63d1b342ffd740b4 (commit) from 2890114600baefb6cb1dde513ca3107258b64c92 (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 346139298bc547d1cbeb5d41f2067577b96ff1fa Author: Dan McGee <dan(a)archlinux.org> Date: Sun Nov 30 16:07:06 2008 -0600 Simplify mercurial revision command Not only does this require less sed-magic, it also fixes FS#12286 where fetching the revision number fails if mercurial is in compact mode. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f7192b595881103f145a118d63d1b342ffd740b4 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Nov 17 21:47:55 2008 -0600 Minor code cleanups Mostly noticed when compiling libalpm/pacman with ICC. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/be_files.c | 6 +++--- lib/libalpm/dload.c | 10 ++++------ scripts/makepkg.sh.in | 2 +- src/pacman/sync.c | 3 ++- 4 files changed, 10 insertions(+), 11 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Added the function parse_options to replace getopt
by Yun Zheng Hu 19 Nov '08

19 Nov '08

This will make makepkg work properly on systems like Mac OS X, where the default installed getopt does not handle long options. see also: http://www.archlinux.org/pipermail/pacman-dev/2008-May/011830.html Signed-off-by: Yun Zheng Hu <yunzheng.hu(a)gmail.com> --- scripts/makepkg.sh.in | 54 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 52 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 6dc7db4..ddcb06e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -27,7 +27,7 @@ # makepkg uses quite a few external programs during its execution. You # need to have at least the following installed for makepkg to function: # awk, bsdtar (libarchive), bzip2, coreutils, fakeroot, find (findutils), -# getopt (util-linux), gettext, grep, gzip, openssl, sed +# gettext, grep, gzip, openssl, sed # gettext initialization export TEXTDOMAIN='pacman' @@ -1117,6 +1117,56 @@ devel_update() { fi } +## +# usage : match_long_opt( $needle, $options ) +# return : matched option +## +match_long_opt() { + local needle=$1; shift + local matches + local item + for item in "$@"; do + [[ "$item" =~ ^"$needle" ]] && matches="$matches $item" + done + matches=($matches) + [ ${#matches[@]} = 1 ] && echo ${matches[0]} +} + +# getopt like parser, returns 1 on error +parse_options() { + local short_options=$1; shift; + local long_options=$1; shift; + local needs_param=0 + until [ -z "$1" ]; do + if [ ${1:0:2} = '--' ]; then + # handle long option + [ "$needs_param" = 1 ] && return 1 + opt=${1:2} + [ -z "$opt" ] && break + longopt=$(match_long_opt $opt ${long_options//,/ }) + [ ! -z "$longopt" ] && printf " %s" "--${longopt}" || return 1 + elif [ ${1:0:1} = '-' ]; then + # handle short option(s) + [ $needs_param = 1 ] && return 1 + opts=${1:1} + local param + local i=0 + while [ $i -lt ${#opts} ]; do + opt=${opts:$((i++)):1} + [[ "$needs_param" = 1 ]] && param="${param}${opt}" && continue + [[ "$short_options" =~ "${opt}" ]] && printf " %s" "-${opt}" || return 1 + [[ "$short_options" =~ "${opt}:" ]] && needs_param=1 + done + [ ! -z "$param" ] && printf " $param" && needs_param=0 + else + # handle non option + [ "$needs_param" = 1 ] && printf " $1" && needs_param=0 + fi + shift + done + printf " --\n" +} + usage() { printf "makepkg (pacman) %s\n" "$myver" echo @@ -1182,7 +1232,7 @@ OPT_LONG="$OPT_LONG,install,log,nocolor,nobuild,rmdeps,repackage,source" OPT_LONG="$OPT_LONG,syncdeps,version,config:" # Pacman Options OPT_LONG="$OPT_LONG,noconfirm,noprogressbar" -OPT_TEMP="$(getopt -o "$OPT_SHORT" -l "$OPT_LONG" -n "$(basename "$0")" -- "$@" || echo 'GETOPT GO BANG!')" +OPT_TEMP="$(parse_options $OPT_SHORT $OPT_LONG "$@" || echo 'GETOPT GO BANG!')" if echo "$OPT_TEMP" | grep -q 'GETOPT GO BANG!'; then # This is a small hack to stop the script bailing with 'set -e' echo; usage; exit 1 # E_INVALID_OPTION; -- 1.5.6.5

3 3

[pacman-dev] [PATCH] Give an error message on alpm_db_register_sync() error
by Nagy Gabor 18 Nov '08

18 Nov '08

> From 8e11e0c7198f7c7bdeb6ca76d647d4831593b965 Mon Sep 17 00:00:00 2001 > From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> > Date: Mon, 17 Nov 2008 17:02:43 +0100 > Subject: [PATCH] Give an error message on alpm_db_register_sync() error > > This patch slightly modifies pacman.c/_parseconfig(): > > See FS#12148. Now pacman prints the following error message in that case: > "error: could not register 'unstable' database (could not open database)" > > I also added an error message for alpm_db_setserver() error. > > I changed the "return(1);" scheme to "ret = 1; goto clean_up;" to make > sure that we free allocated memory and close open files. > > Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> > --- > src/pacman/pacman.c | 46 ++++++++++++++++++++++++++++++++++------------ > 1 files changed, 34 insertions(+), 12 deletions(-) > > diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c > index 3813a16..6d588f8 100644 > --- a/src/pacman/pacman.c > +++ b/src/pacman/pacman.c > @@ -583,6 +583,7 @@ static int _parseconfig(const char *file, const char *givensection, > int linenum = 0; > char *ptr, *section = NULL; > pmdb_t *db = NULL; > + int ret = 0; > > pm_printf(PM_LOG_DEBUG, "config: attempting to read file %s\n", file); > fp = fopen(file, "r"); > @@ -625,7 +626,8 @@ static int _parseconfig(const char *file, const char *givensection, > if(!strlen(section)) { > pm_printf(PM_LOG_ERROR, _("config file %s, line %d: bad section name.\n"), > file, linenum); > - return(1); > + ret = 1; > + goto clean_up; > } > /* if we are not looking at the options section, register a db and also > * ensure we have set all of our library paths as the library is too stupid > @@ -633,6 +635,12 @@ static int _parseconfig(const char *file, const char *givensection, > if(strcmp(section, "options") != 0) { > setlibpaths(); > db = alpm_db_register_sync(section); > + if(db == NULL) { > + pm_printf(PM_LOG_ERROR, _("could not register '%s' database (%s)\n"), > + section, alpm_strerrorlast()); > + ret = 1; > + goto clean_up; > + } > } > } else { > /* directive */ > @@ -647,13 +655,15 @@ static int _parseconfig(const char *file, const char *givensection, > if(key == NULL) { > pm_printf(PM_LOG_ERROR, _("config file %s, line %d: syntax error in config file- missing key.\n"), > file, linenum); > - return(1); > + ret = 1; > + goto clean_up; > } > /* For each directive, compare to the camelcase string. */ > if(section == NULL) { > pm_printf(PM_LOG_ERROR, _("config file %s, line %d: All directives must belong to a section.\n"), > file, linenum); > - return(1); > + ret = 1; > + goto clean_up; > } > if(ptr == NULL && strcmp(section, "options") == 0) { > /* directives without settings, all in [options] */ > @@ -678,7 +688,8 @@ static int _parseconfig(const char *file, const char *givensection, > } else { > pm_printf(PM_LOG_ERROR, _("config file %s, line %d: directive '%s' not recognized.\n"), > file, linenum, key); > - return(1); > + ret = 1; > + goto clean_up; > } > } else { > /* directives with settings */ > @@ -709,7 +720,8 @@ static int _parseconfig(const char *file, const char *givensection, > if(alpm_option_add_cachedir(ptr) != 0) { > pm_printf(PM_LOG_ERROR, _("problem adding cachedir '%s' (%s)\n"), > ptr, alpm_strerrorlast()); > - return(1); > + ret = 1; > + goto clean_up; > } > pm_printf(PM_LOG_DEBUG, "config: cachedir: %s\n", ptr); > } else if(strcmp(key, "RootDir") == 0) { > @@ -733,13 +745,15 @@ static int _parseconfig(const char *file, const char *givensection, > config->cleanmethod = PM_CLEAN_KEEPCUR; > } else { > pm_printf(PM_LOG_ERROR, _("invalid value for 'CleanMethod' : '%s'\n"), ptr); > - return(1); > + ret = 1; > + goto clean_up; > } > pm_printf(PM_LOG_DEBUG, "config: cleanmethod: %s\n", ptr); > } else { > pm_printf(PM_LOG_ERROR, _("config file %s, line %d: directive '%s' not recognized.\n"), > file, linenum, key); > - return(1); > + ret = 1; > + goto clean_up; > } > } else if(strcmp(key, "Server") == 0) { > /* let's attempt a replacement for the current repo */ > @@ -747,27 +761,35 @@ static int _parseconfig(const char *file, const char *givensection, > > if(alpm_db_setserver(db, server) != 0) { > /* pm_errno is set by alpm_db_setserver */ > - return(1); > + pm_printf(PM_LOG_ERROR, _("could not add server URL to database '%s': %s (%s)\n"), > + alpm_db_get_name(db), server, alpm_strerrorlast()); > + free(server); > + ret = 1; > + goto clean_up; > } > > free(server); > } else { > pm_printf(PM_LOG_ERROR, _("config file %s, line %d: directive '%s' not recognized.\n"), > file, linenum, key); > - return(1); > + ret = 1; > + goto clean_up; > } > } > } > } > - fclose(fp); > + > +clean_up: > + if(fp) { > + fclose(fp); > + } > if(section){ > free(section); > } > - > /* call setlibpaths here to ensure we have called it at least once */ > setlibpaths(); > pm_printf(PM_LOG_DEBUG, "config: finished parsing %s\n", file); > - return(0); > + return(ret); > } > > /** Parse a configuration file. > -- > 1.6.0.3 >

2 3

Re: [pacman-dev] Status of "Splitting packages with makepkg"
by Marc - A. Dahlhaus [ Administration | Westermann GmbH ] 17 Nov '08

17 Nov '08

Hello Allen, the prototype has a little problem in case you give -L option to makepkg as it is now: As makepkg pipes the output of the build-function into tee, the build-function gets executed in a sub-shell. Any changes of variables in context of main-shell from inside build-function will not work in that case. This leads to that we have to set the values of all split-package-variables outside of the respective build-functions. Am Donnerstag, den 13.11.2008, 21:34 +1000 schrieb Allan McRae: > Jakub Schmidtke wrote: > > Hi. > > > > I guess this is the right place to ask :) > > What is the status of this feature? I have read discussions > > from June and August, and some of the ideas look very interesting. > > Is there anything going on with this? > > Is there a way to help (as non dev/TU though)? :) > > > > > > Jakub Schmidtke > > > > I was taking the lead on getting this into makepkg but have been busy > with other things in the last couple of months. About the only thing I > have in my git branch is the prototype that was "decided on" (or > possibly the least rejected....) > > See > http://dev.archlinux.org/~allan/gitweb/gitweb.cgi?p=pacman.git;a=commitdiff… > > Allan > > > > > _______________________________________________ > pacman-dev mailing list > pacman-dev(a)archlinux.org > http://archlinux.org/mailman/listinfo/pacman-dev

5 9

[pacman-dev] [PATCH] makepkg: several small bits of tidying
by Allan McRae 14 Nov '08

14 Nov '08

1. Do not warn people about missing arch if they are using --ignorearch. 2. Remove unneed reference to bug report about using fakeroot as little as possible. We want to do that, bug report of not. 3. Removes superfluous warning given when building as root. The user has already used the "--asroot" flag. 4. Move comment about skipping warning message to above where it occurs 5. Do not warn about skipping source retreval, integrety checks and extraction when using --repackage 6. Do not warn about skipping build when using --repackage 7. Move comment about fakeroot usage to above test condition Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 31 +++++++++---------------------- 1 files changed, 9 insertions(+), 22 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b0d1dad..f5cdd90 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1409,10 +1409,6 @@ if ! in_array $CARCH ${arch[@]}; then plain "$(gettext "Note that many packages may need a line added to their %s")" "$BUILDSCRIPT" plain "$(gettext "such as arch=('%s').")" "$CARCH" exit 1 - else - warning "$(gettext "%s is not available for the '%s' architecture.")" "$pkgname" "$CARCH" - plain "$(gettext "Note that many packages may need a line added to their %s")" "$BUILDSCRIPT" - plain "$(gettext "such as arch=('%s').")" "$CARCH" fi fi @@ -1460,11 +1456,8 @@ if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \ fi # Run the bare minimum in fakeroot -# fix flyspray bug 6208 -- using makepkg with fakeroot gives an error if [ "$INFAKEROOT" = "1" ]; then - if [ "$REPKG" = "1" ]; then - warning "$(gettext "Skipping build.")" - else + if [ "$REPKG" = "0" ]; then run_build tidy_install fi @@ -1477,10 +1470,6 @@ fi msg "$(gettext "Making package: %s")" "$pkgname $pkgver-$pkgrel $CARCH ($(date))" -if [ $EUID -eq 0 ]; then - warning "$(gettext "Running makepkg as root...")" -fi - # if we are creating a source-only package, go no further if [ "$SOURCEONLY" != "0" ]; then if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}${SRCEXT}" \ @@ -1495,10 +1484,10 @@ fi # fix flyspray bug #5973 if [ "$NODEPS" = "1" -o "$NOBUILD" = "1" -o "$REPKG" = "1" ]; then + # no warning message needed for nobuild, repkg if [ "$NODEPS" = "1" ]; then warning "$(gettext "Skipping dependency checks.")" fi - # 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 @@ -1524,7 +1513,7 @@ umask 0022 mkdir -p "$srcdir" cd "$srcdir" -if [ "$NOEXTRACT" = "1" -o "$REPKG" = "1" ]; then +if [ "$NOEXTRACT" = "1" ]; then warning "$(gettext "Skipping source retrieval -- using existing src/ tree")" warning "$(gettext "Skipping source integrity checks -- using existing src/ tree")" warning "$(gettext "Skipping source extraction -- using existing src/ tree")" @@ -1533,11 +1522,11 @@ if [ "$NOEXTRACT" = "1" -o "$REPKG" = "1" ]; then error "$(gettext "The source directory is empty, there is nothing to build!")" plain "$(gettext "Aborting...")" exit 1 - elif [ "$REPKG" = "1" -a $ ! -d "$pkgdir" -o "$(ls "$pkgdir" 2>/dev/null)" = "" $ ]; then - error "$(gettext "The package directory is empty, there is nothing to repackage!")" - plain "$(gettext "Aborting...")" - exit 1 fi +elif [ "$REPKG" = "1" -a $ ! -d "$pkgdir" -o "$(ls "$pkgdir" 2>/dev/null)" = "" $ ]; then + error "$(gettext "The package directory is empty, there is nothing to repackage!")" + plain "$(gettext "Aborting...")" + exit 1 else download_sources check_checksums @@ -1556,11 +1545,9 @@ else mkdir -p "$pkgdir" cd "$startdir" + # if we are root or if fakeroot is not enabled, then we don't use it if [ "$(check_buildenv fakeroot)" != "y" -o $EUID -eq 0 ]; then - # if we are root or if fakeroot is not enabled, then we don't use it - if [ "$REPKG" = "1" ]; then - warning "$(gettext "Skipping build.")" - else + if [ "$REPKG" = "0" ]; then devel_update run_build tidy_install -- 1.6.0.4

3 3