- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] BSD/Mac OS X sed inplace backups with mktemp
by Kevin Barry 16 Feb '09

16 Feb '09

This patch changes the way that sed inplace is run in makepkg when running in versionpkg mode. Previous, sed would run with no backup file, called in the GNU way. It seems there is no cross platform method of calling sed inplace with no backup (BSD/sed uses sed -i '', GNU/sed uses sed -i'' or simply sed -i). Instead, this patch creates a backup file (from an mktemp extension) and removes it after the successful completetion of the sed operation. This means the user should not see the backup file, unless something went wrong (Full partition for example) in which case they don't lose the previous PKGBUILD as they would in previous versions. Further information about GNU/sed versus BSD/sed: On Mac OS X (Man page is from FreeBSD, so I believe it would be the same there): sed -i -e 's/foo/bar/' filename will create a backup file named filename-e sed -i -e 's/foo/bar/' -e 's/asd/dsa/' filename will give an error message because of the second -e sed -i 's/foo/bar/' filename will give an error message sed -i '' 's/foo/bar/' filename will work without creating a backup, but fails on GNU/sed sed -i'' 's/foo/bar/' filename sed -i 's/foo/bar/' filename Work only on GNU/sed Signed-off-by: Kevin Barry <barryk gmail com> --- scripts/makepkg.sh.in | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e10c345..5af4add 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1199,8 +1199,13 @@ devel_update() { if [ -n "$newpkgver" ]; then if [ "$newpkgver" != "$pkgver" ]; then if [ -f "./$BUILDSCRIPT" ]; then - sed -i "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "./$BUILDSCRIPT" - sed -i "s/^pkgrel=[^ ]*/pkgrel=1/" "./$BUILDSCRIPT" + # Create temporary filename for sed backup. + # Needed for BSD/GNU cross-platform compatibility + TEMP_NAME=$(mktemp -u "./${BUILDSCRIPT}.XXXXXX") + TEMP_NAME=${TEMP_NAME#"./${BUILDSCRIPT}."} + sed -i".${TEMP_NAME}" -e "s/^pkgver=[^ ]*/pkgver=$newpkgver/" \ + -e "s/^pkgrel=[^ ]*/pkgrel=1/" "./$BUILDSCRIPT" && + rm -f "./${BUILDSCRIPT}.${TEMP_NAME}" source "$BUILDSCRIPT" fi fi -- 1.6.1.2

1 0

[pacman-dev] [PATCH] BSD/Mac OS X sed inplace backups
by Kevin Barry 16 Feb '09

16 Feb '09

> What does BSD sed currently do? I am assuming it leaves a backup file(s) but can you clarify the numbers and names of these? On Mac OS X (Man page is from FreeBSD, so I believe it would be the same there): sed -i -e 's/foo/bar/' filename will create a backup file named filename-e sed -i -e 's/foo/bar' -e '/asd/dsa/' filename will give an error message because sed -i 's/foo/bar' filename will give an error message sed -i '' 's/foo/bar/' filename will work without creating a backup file, but fails on GNU/sed It's really annoying that BSD sed doesn't like sed -i'' and GNU/sed doesn't like sed -i '' This patch changes the way that sed inplace is run in makepkg when running in versionpkg mode. Previous, sed would run with no backup file, called in the GNU way. It seems there is no cross platform method of calling sed inplace with no backup (BSD/sed uses sed -i '', GNU/sed uses sed -i'' or simply sed -i). Instead, this patch creates a backup file (.pkgsave) and removes it after the succesful completion of the sed operation. This means the user should not see the backup file, unless something went run (full hard drive?) in which case they don't lose the PKGBUILD as they would have before. Signed-off-by: Kevin Barry <barryk gmail com> --- scripts/makepkg.sh.in | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e10c345..8ddf88f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1199,8 +1199,9 @@ devel_update() { if [ -n "$newpkgver" ]; then if [ "$newpkgver" != "$pkgver" ]; then if [ -f "./$BUILDSCRIPT" ]; then - sed -i "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "./$BUILDSCRIPT" - sed -i "s/^pkgrel=[^ ]*/pkgrel=1/" "./$BUILDSCRIPT" + sed -i.pkgsave -e "s/^pkgver=[^ ]*/pkgver=$newpkgver/" \ + -e "s/^pkgrel=[^ ]*/pkgrel=1/" "./$BUILDSCRIPT" && + rm -f "./${BUILDSCRIPT}.pkgsave" source "$BUILDSCRIPT" fi fi -- 1.6.1.2

3 2

[pacman-dev] [PATCH] Mac OS X [1] Full path of stat (SIZECMD) and [2] sed -i
by Kevin Barry 15 Feb '09

15 Feb '09

Change configure.ac to use the full path of stat when on darwin/mac. This is needed for situations when a user installs the GNU/coreutils and places it in their path before /usr/bin, but the SIZECMD is already configured for Darwin's version of stat. Signed-off-by: Kevin Barry <barryk gmail com> --- configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 2e7f433..216cf76 100644 --- a/configure.ac +++ b/configure.ac @@ -190,7 +190,7 @@ case "${host_os}" in ;; darwin*) host_os_darwin=yes - SIZECMD="stat -f %z" + SIZECMD="/usr/bin/stat -f %z" ;; esac -- 1.6.1.2 Patch Number Two This patch changes the way that sed inplace is run in makepkg when running in versionpkg mode. Previous, sed would run with no backup file, called in the GNU way. It seems there is no cross platform method of calling sed inplace with no backup (BSD/sed uses sed -i '', GNU/sed uses sed -i'' or simply sed -i). Instead, this patch creates a backup file (.pkgsave) and removes it after the succesful completion of the sed operation. This means the user should not see the backup file, unless something went run (full hard drive?) in which case they don't lose the PKGBUILD as they would have before. Signed-off-by: Kevin Barry <barryk gmail com> --- scripts/makepkg.sh.in | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e10c345..8ddf88f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1199,8 +1199,9 @@ devel_update() { if [ -n "$newpkgver" ]; then if [ "$newpkgver" != "$pkgver" ]; then if [ -f "./$BUILDSCRIPT" ]; then - sed -i "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "./$BUILDSCRIPT" - sed -i "s/^pkgrel=[^ ]*/pkgrel=1/" "./$BUILDSCRIPT" + sed -i.pkgsave -e "s/^pkgver=[^ ]*/pkgver=$newpkgver/" \ + -e "s/^pkgrel=[^ ]*/pkgrel=1/" "./$BUILDSCRIPT" && + rm -f "./${BUILDSCRIPT}.pkgsave" source "$BUILDSCRIPT" fi fi -- 1.6.1.2

3 2

[pacman-dev] Non-reentrancy of libalpm, why?
by Patrick Walton 15 Feb '09

15 Feb '09

Hi, I noticed that libalpm isn't reentrant/thread-safe, even though it defines pmhandle_t to store all global information instead of using multiple global variables. This is unfortunate for my use case. I'm thinking about writing a cross-compiling makepkg-like utility, which would need to access two package handles simultaneously at once: that of the host and that of the target. Is there a reason why libalpm isn't reentrant? And how frozen is the libalpm API supposed to be? Thanks, Patrick

2 1

[pacman-dev] PLEASE take my patches. PLEASE.
by Bryan Ischo 15 Feb '09

15 Feb '09

I hate to be reduced to begging, but after weeks of no one taking my patches, this is what I have to do. I jumped through every hoop I was asked to jump through to get my patches accepted (and to be honest, there were ALOT of hoops). My most recent patches apply to the source code without any conflicts and address all outstanding issues raised on this list. Dan McGee said that if I addressed those issues, he'd take my patches. Well I did, weeks ago, and yet, my patches are not in the tree. So this is one last attempt on my part to try to get a pacman dev to apply my patches to the master git tree. It should be trivially easy - should take all of a few seconds. Thanks, Bryan

3 3

[pacman-dev] HTML email will be rejected
by Aaron Griffin 13 Feb '09

13 Feb '09

Hello all, I am writing to inform you that I have changed all the Arch lists to reject HTML formatted email. Please send messages in plain text only. Note: This is true of all lists, but I am only sending this message to the higher trafficked lists. Cheers, Aaron

1 1

[pacman-dev] [PATCH] repo-add: added a realpath implementation in bash
by Yun Zheng Hu 11 Feb '09

11 Feb '09

When realpath or readlink is not available it will fallback to a realpath implementation in bash. An extra check is also added for "readlink -f", because not all platforms support the -f flag. The readlink implementation in bash is borrowed from Debian's dpkg tools. Signed-off-by: Yun Zheng Hu <yunzheng.hu(a)gmail.com> --- scripts/repo-add.sh.in | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index c89e2a5..ea16731 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -297,11 +297,28 @@ fi # check for and store the name of a realpath-like program if [ $(type -t realpath) ]; then realpath='realpath' -elif [ $(type -t readlink) ]; then +elif [ $(type -t readlink) -a "$(readlink -f . 2>/dev/null)" != "" ]; then realpath='readlink -f' else - error "$(gettext "Either realpath or readlink are required by repo-add.")" - exit 1 # $E_MISSING_PROGRAM + realpath_bash() + { + fname=${1%/} # strips trailing '/' + while [ -L "$fname" ]; do + oldfname="$fname" + fname="$(command ls -l $fname)" + fname="${fname#*\> }" + if [ "$fname" = . ] ; then + fname="$(dirname $oldfname)" + elif echo $fname | grep -vq '^/' - ; then + fname="$(dirname $oldfname)/$fname" + fi + done + pushd $(dirname $fname) > /dev/null + fname=$(pwd -P)/$(basename $fname) + popd > /dev/null + echo $fname + } + realpath=realpath_bash fi # main routine -- 1.6.1.2

5 5

[pacman-dev] [PATCH] Allow vendor based DLAGENT settings in makepkg.conf
by Yun Zheng Hu 08 Feb '09

08 Feb '09

This patch will allow the default DLAGENT settings to be overridden in the configure script. This will allow better default DLAGENT settings for specific platforms/vendors. For example: Mac OS X does not have wget installed by default, but it does have curl by default. Currently the patch only overrides the default FTP and HTTP/HTTPS agents when configuring for Mac OS X. Signed-off-by: Yun Zheng Hu <yunzheng.hu(a)gmail.com> --- configure.ac | 20 ++++++++++++++++++++ etc/Makefile.am | 5 +++++ etc/makepkg.conf.in | 10 +++++----- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 2e7f433..0a63405 100644 --- a/configure.ac +++ b/configure.ac @@ -236,6 +236,26 @@ case "${host}" in ;; esac +# Configure DLAGENT settings, used in makepkg.conf +DLAGENT_FTP="ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u" +DLAGENT_HTTP="http::/usr/bin/wget -c -t 3 --waitretry=3 -O %o %u" +DLAGENT_HTTPS="https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u" +DLAGENT_RSYNC="rsync::/usr/bin/rsync -z %u %o" +DLAGENT_SCP="scp::/usr/bin/scp -C %u %o" +case "${host_vendor}" in + apple) + DLAGENT_FTP="ftp::/usr/bin/curl --location --continue-at - --retry 3 --retry-delay 3 -o %o %u" + DLAGENT_HTTP="http::/usr/bin/curl --location --continue-at - --retry 3 --retry-delay 3 -o %o %u" + DLAGENT_HTTPS="https::/usr/bin/curl --location --continue-at - --retry 3 --retry-delay 3 --insecure -o %o %u" + ;; +esac + +AC_SUBST(DLAGENT_FTP) +AC_SUBST(DLAGENT_HTTP) +AC_SUBST(DLAGENT_HTTPS) +AC_SUBST(DLAGENT_RSYNC) +AC_SUBST(DLAGENT_SCP) + # Now do some things common to all architectures CHOST="${host}" AC_SUBST(CARCH) diff --git a/etc/Makefile.am b/etc/Makefile.am index 55c28c3..1605bfc 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -15,6 +15,11 @@ edit = sed \ -e 's|@SRCEXT[@]|$(SRCEXT)|g' \ -e 's|@CARCH[@]|$(CARCH)|g' \ -e 's|@CHOST[@]|$(CHOST)|g' \ + -e 's|@DLAGENT_FTP[@]|$(DLAGENT_FTP)|g' \ + -e 's|@DLAGENT_HTTP[@]|$(DLAGENT_HTTP)|g' \ + -e 's|@DLAGENT_HTTPS[@]|$(DLAGENT_HTTPS)|g' \ + -e 's|@DLAGENT_RSYNC[@]|$(DLAGENT_RSYNC)|g' \ + -e 's|@DLAGENT_SCP[@]|$(DLAGENT_SCP)|g' \ -e 's|@ARCHSWITCH[@]|$(ARCHSWITCH)|g' \ -e 's|@CARCHFLAGS[@]|$(CARCHFLAGS)|g' \ -e 's|@ROOTDIR[@]|$(ROOTDIR)|g' diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index d811867..d6c4ea6 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -8,11 +8,11 @@ # #-- The download utilities that makepkg should use to acquire sources # Format: 'protocol::agent' -DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u' - 'http::/usr/bin/wget -c -t 3 --waitretry=3 -O %o %u' - 'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u' - 'rsync::/usr/bin/rsync -z %u %o' - 'scp::/usr/bin/scp -C %u %o') +DLAGENTS=('@DLAGENT_FTP@' + '@DLAGENT_HTTP@' + '@DLAGENT_HTTPS@' + '@DLAGENT_RSYNC@' + '@DLAGENT_SCP@') # Other common tools: # /usr/bin/snarf -- 1.6.1.2

3 2

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.2.2-5-gea84819
by dan＠archlinux.org 08 Feb '09

08 Feb '09

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 ea84819bbbdba90f950339790d482f2348c2e9ef (commit) from 472e51b975b9cb8fe1f67c03ff72bbc067fa7f01 (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: scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-78-g04c2b9d
by dan＠archlinux.org 08 Feb '09

08 Feb '09

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 04c2b9d4edb7f7e592919fa3bb975f9edd4fa0a6 (commit) via ea84819bbbdba90f950339790d482f2348c2e9ef (commit) via 34e1413d756269dcd71a32dd5d2dbb263a943051 (commit) via 14230869e6a37526f8a1bdb1fb88f23309b10aef (commit) via eab96848376db6f54f05773a7e924faf0355137f (commit) from c794661f1ea8c819d479948e92e5648de62787c5 (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 04c2b9d4edb7f7e592919fa3bb975f9edd4fa0a6 Merge: 34e1413d756269dcd71a32dd5d2dbb263a943051 ea84819bbbdba90f950339790d482f2348c2e9ef Author: Dan McGee <dan(a)archlinux.org> Date: Sun Feb 8 11:43:08 2009 -0600 Merge branch 'maint' commit 34e1413d756269dcd71a32dd5d2dbb263a943051 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Mon Jan 19 22:54:00 2009 +0100 Delay the creation of local and sync db dir. We don't need to create the directories when local or sync dbs are registered. For example, if a sync db does not exist, we cannot even do "pacman -Q" as an user. Instead, we can create the local db if needed during the db_prepare operation, and sync dbs on db_update. Also remove some more useless abstractions in db_update and switch to a much more efficient way to remove a sync db : rm -rf. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> commit 14230869e6a37526f8a1bdb1fb88f23309b10aef Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Mon Jan 19 20:45:12 2009 +0100 Remove some db abstraction crap. These db_open and db_close looked quite useless. And they caused the db directory to be opened on a simple registering of a database. This is totally unneeded, this opening can be delayed to when we actually need it. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> commit eab96848376db6f54f05773a7e924faf0355137f Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sun Jan 18 14:01:24 2009 +0100 alpm_unpack : change prefix handling to workaround FS#12148. Instead of appending the prefix to each entry name, we can chdir to the prefix before extracting, and restoring when it is done. This seems to work better with the strange and special case of FS#12148 where an archive contained the "./" entry. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/be_files.c | 81 ++++++++++++++++++++++------------------------- lib/libalpm/db.c | 41 ------------------------ lib/libalpm/db.h | 3 -- lib/libalpm/util.c | 32 ++++++++++++++----- scripts/makepkg.sh.in | 4 +- 5 files changed, 64 insertions(+), 97 deletions(-) hooks/post-receive -- The official pacman repository

1 0