- Pacman-dev - lists.archlinux.org

[pacman-dev] Fwd: [PATCH] makepkg: Added the function parse_options to replace getopt
by Dan McGee 14 Nov '08

14 Nov '08

---------- Forwarded message ---------- From: Yun Zheng Hu <yunzheng.hu(a)gmail.com> Date: Wed, Nov 12, 2008 at 2:42 PM Subject: Re: [PATCH] makepkg: Added the function parse_options to replace getopt To: dpmcgee(a)gmail.com Hello, I sent the following message (below) to the mailing list at pacman-dev(a)archlinux.org, this was yesterday night. But I think it never arrived since I do not see it at the discussionlist or in my inbox (I subscribed to the list). On Wed, Nov 12, 2008 at 1:07 AM, Yun Zheng Hu <yunzheng.hu(a)gmail.com> wrote: > 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..33f5ba9 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

1 0

[pacman-dev] Status of "Splitting packages with makepkg"
by Jakub Schmidtke 13 Nov '08

13 Nov '08

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

3 2

[pacman-dev] Turkish translation fixes
by Samed Beyribey 11 Nov '08

11 Nov '08

Hello, I've fixed some typos in both libalpm and pacman translation. (used some order switching in libalpm translation) I've attached translation files to the mail and i couldnt create a patch using git, sorry for this. -im not familiar with git :(- However, a guide of creating patches for translations would be great. Best regards, Samed.

1 0

[pacman-dev] [PATCH] New error type: PM_ERR_PKG_IGNORED
by Nagy Gabor 09 Nov '08

09 Nov '08

Patch attached (this is a fix for FS#12059), and can be found in my working tree: http://repo.or.cz/w/pacman-ng.git?a=shortlog;h=refs/heads/working Bye ------------------------------------------------------ SZTE Egyetemi Konyvtar - http://www.bibl.u-szeged.hu This message was sent using IMP: http://horde.org/imp/

1 0

[pacman-dev] Downgradability...sort of....
by Jatheendra 07 Nov '08

07 Nov '08

Hi all, Im trying to add some downgradability magic into pacman .Being quite new to pacman code, i need your help to identify the possible pitfalls of my approach before trying something. What i plan to do is.. In libalpm/remove.c unlink_file() [ I guess remove.c is the only place where we are removing files ] replace all unlink(), rename() etc with copyandunlink , copyandrename etc which will copy the file first into an archive file package-backup.tgs in cache,then do unlink or rename. Then finally include all the necessary .INSTALL ,PKGINFO ,.CHANGELOG etc and clean up. So even if i do a -Scc i will have a backup of what was installed on my system and can roll back to the previous state. And can sombody please point me to some documentation for libarchive apart from the manpages... Jatheendra

5 7

[pacman-dev] [PATCH] libalpm: add PID to db.lck
by Allan McRae 03 Nov '08

03 Nov '08

This is the first step in being able to automatically remove phantom lock files. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/util.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index da3463b..811572a 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -242,7 +242,9 @@ char *_alpm_strreplace(const char *str, const char *needle, const char *replace) int _alpm_lckmk() { int fd; - char *dir, *ptr; + pid_t pid; + size_t len; + char *dir, *ptr, *spid; const char *file = alpm_option_get_lockfile(); /* create the dir of the lockfile first */ @@ -256,7 +258,16 @@ int _alpm_lckmk() while((fd = open(file, O_WRONLY | O_CREAT | O_EXCL, 0000)) == -1 && errno == EINTR); - return(fd > 0 ? fd : -1); + if(fd > 0) { + pid = getpid(); + size_t len = snprintf(spid, 0, "%d", pid) + 1; + spid = malloc(len); + snprintf(spid, len, "%d", pid) + 1; + while(write(fd, (void *)spid, len) == -1 && errno == EINTR); + fsync(fd); + return(fd); + } + return(-1); } /* Remove a lock file */ -- 1.6.0.3

2 3

[pacman-dev] [PATCH] Turn libarchive warnings into libalpm warnings
by Dan McGee 01 Nov '08

01 Nov '08

Rather than hiding these warnings, show them to the user as they happen. This will prevent things such as hiding full filesystem errors (ENOSPC) from the user as seen in FS#11639. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- Note: this patch is almost superseded by the next one, but its important to note we are suddenly going to put more force behind these libarchive warnings. lib/libalpm/add.c | 4 ++-- lib/libalpm/util.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 5040589..f4caa5c 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -444,7 +444,7 @@ static int extract_single_file(struct archive *archive, ret = archive_read_extract(archive, entry, archive_flags); if(ret == ARCHIVE_WARN) { /* operation succeeded but a non-critical error was encountered */ - _alpm_log(PM_LOG_DEBUG, "warning extracting %s (%s)\n", + _alpm_log(PM_LOG_WARNING, "warning extracting %s (%s)\n", entryname_orig, archive_error_string(archive)); } else if(ret != ARCHIVE_OK) { _alpm_log(PM_LOG_ERROR, _("could not extract %s (%s)\n"), @@ -594,7 +594,7 @@ static int extract_single_file(struct archive *archive, ret = archive_read_extract(archive, entry, archive_flags); if(ret == ARCHIVE_WARN) { /* operation succeeded but a non-critical error was encountered */ - _alpm_log(PM_LOG_DEBUG, "warning extracting %s (%s)\n", + _alpm_log(PM_LOG_WARNING, "warning extracting %s (%s)\n", entryname_orig, archive_error_string(archive)); } else if(ret != ARCHIVE_OK) { _alpm_log(PM_LOG_ERROR, _("could not extract %s (%s)\n"), diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index da3463b..a9330d3 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -333,7 +333,7 @@ int _alpm_unpack(const char *archive, const char *prefix, const char *fn) int readret = archive_read_extract(_archive, entry, 0); if(readret == ARCHIVE_WARN) { /* operation succeeded but a non-critical error was encountered */ - _alpm_log(PM_LOG_DEBUG, "warning extracting %s (%s)\n", + _alpm_log(PM_LOG_WARNING, "warning extracting %s (%s)\n", entryname, archive_error_string(_archive)); } else if(readret != ARCHIVE_OK) { _alpm_log(PM_LOG_ERROR, _("could not extract %s (%s)\n"), -- 1.6.0.3

3 4

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.1-45-g9394f22
by dan＠archlinux.org 01 Nov '08

01 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, master has been updated via 9394f229a0328228e810b7d4588b24643b42df6a (commit) via 43f9eb1aa95d78a1560e30536a05525f2b18de0d (commit) via 8d4e1e67546bcc04b5412e0f94a752c7215fb53d (commit) via 314b4462d2ef1264b50b6745c57072f9c7b9d14e (commit) via c4b9991258fb360e0d140a84efe7803eb633df79 (commit) via 2890114600baefb6cb1dde513ca3107258b64c92 (commit) via 8d33dcb81c464f5e42d83078472bc509e087dd62 (commit) from cd51abf0c8d04c72cc85b28cd45b33b9020c661e (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 9394f229a0328228e810b7d4588b24643b42df6a Merge: 43f9eb1aa95d78a1560e30536a05525f2b18de0d 2890114600baefb6cb1dde513ca3107258b64c92 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Oct 31 19:55:50 2008 -0500 Merge branch 'maint' commit 43f9eb1aa95d78a1560e30536a05525f2b18de0d Author: Dan McGee <dan(a)archlinux.org> Date: Fri Oct 31 19:40:55 2008 -0500 Set SIGPIPE handler to SIG_IGN when downloading We don't want a failed write to kill our whole program when we are downloading things, so set the SIGPIPE handler to ignore when downloading and restore any previous signal handler when we complete the download. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8d4e1e67546bcc04b5412e0f94a752c7215fb53d Author: Dan McGee <dan(a)archlinux.org> Date: Fri Oct 31 19:11:38 2008 -0500 Make libfetch the 'native' download library Use libfetch naming in the code in place of libdownload names. This is in preparation for dropping support for libdownload at some point as libfetch can run on Linux. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 314b4462d2ef1264b50b6745c57072f9c7b9d14e Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri Oct 24 02:05:12 2008 +0200 -Qu rework From now on -Qu is an "outdated package" filter on local database. (This is a behaviour change.) This patch fixes some memleaks and makes the code cleaner, for details see my comment on FS#7884. FS#11868 is implemented. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c4b9991258fb360e0d140a84efe7803eb633df79 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Oct 29 14:21:28 2008 +1000 makepkg: actually fix passing PKGBUILD from pipe If PKGBUILD (BUILDSCRIPT) is not found, test for information from a pipe and use that. Fixes FS#9187. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8d33dcb81c464f5e42d83078472bc509e087dd62 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Oct 28 22:04:39 2008 +1000 makepkg: enable passing PKGBUILD from pipe Do not attemp to update pkgver/pkgrel when reading a SCM based PKGBUILD from a pipe. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/alpm.h | 4 +-- lib/libalpm/dload.c | 47 +++++++++++++++++++++++++++----------------- lib/libalpm/error.c | 6 ++-- lib/libalpm/sync.c | 52 +++++++++++------------------------------------- lib/libalpm/sync.h | 3 +- lib/libalpm/trans.c | 13 +----------- lib/libalpm/trans.h | 1 - scripts/makepkg.sh.in | 25 +++++++++++++++++------ src/pacman/pacman.c | 2 +- src/pacman/query.c | 28 +++---------------------- 10 files changed, 70 insertions(+), 111 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Set SIGPIPE handler to SIG_IGN when downloading
by Dan McGee 01 Nov '08

01 Nov '08

We don't want a failed write to kill our whole program when we are downloading things, so set the SIGPIPE handler to ignore when downloading and restore any previous signal handler when we complete the download. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/dload.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index e4a8a0b..f197d06 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -24,6 +24,7 @@ #include <errno.h> #include <string.h> #include <unistd.h> +#include <signal.h> #include <limits.h> /* the following two are needed on BSD for libfetch */ #if defined(HAVE_SYS_SYSLIMITS_H) @@ -115,6 +116,7 @@ static int download_internal(const char *url, const char *localpath, size_t dl_thisfile = 0; char *tempfile, *destfile, *filename; int ret = 0; + struct sigaction new_action, old_action; struct url *fileurl = url_for_string(url); if(!fileurl) { @@ -148,6 +150,13 @@ static int download_internal(const char *url, const char *localpath, /* 10s timeout - TODO make a config option */ fetchTimeout = 10000; + /* ignore any SIGPIPE signals- these may occur if our FTP socket dies or + * something along those lines. Store the old signal handler first. */ + new_action.sa_handler = SIG_IGN; + sigemptyset(&new_action.sa_mask); + sigaction(SIGPIPE, NULL, &old_action); + sigaction(SIGPIPE, &new_action, NULL); + dlf = fetchXGet(fileurl, &ust, (handle->nopassiveftp ? "" : "p")); if(fetchLastErrCode != 0 || dlf == NULL) { @@ -238,6 +247,9 @@ static int download_internal(const char *url, const char *localpath, ret = 0; cleanup: + /* restore any existing SIGPIPE signal handler */ + sigaction(SIGPIPE, &old_action, NULL); + FREE(tempfile); FREE(destfile); if(localf != NULL) { -- 1.6.0.3

1 0

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

01 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 2890114600baefb6cb1dde513ca3107258b64c92 (commit) from a63aeed562c8bdd6604ec50e6a4b684f6edabda3 (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 2890114600baefb6cb1dde513ca3107258b64c92 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Oct 31 18:59:19 2008 -0500 makepkg: fix bash substitution to work under older versions Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0