- Arch-dev-public - lists.archlinux.org

[arch-dev-public] [PATCH 2/2] Accept any *.pkg.tar.* package file name
by Pierre Schmitz 23 Feb '10

23 Feb '10

With this patch packages with different compressions are accepted. It is ensured that one cannot have the same package with different compression extensions. The new functions getpkgfile{,s} are used to sanitize globed filenames. Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> --- config | 2 +- db-functions | 28 ++++++++++++++++++++++++++++ db-move | 8 +++----- db-update | 10 +++++----- 4 files changed, 37 insertions(+), 11 deletions(-) diff --git a/config b/config index 92def37..6343bc0 100644 --- a/config +++ b/config @@ -12,7 +12,7 @@ TMPDIR="/srv/tmp" ARCHES=(i686 x86_64) BUILDSCRIPT="PKGBUILD" DBEXT=".db.tar.gz" -PKGEXT=".pkg.tar.gz" +PKGEXT=".pkg.tar.*" SRCEXT=".src.tar.gz" # Allowed licenses: get sourceballs only for licenses in this array diff --git a/db-functions b/db-functions index a4cffd7..915d011 100644 --- a/db-functions +++ b/db-functions @@ -87,6 +87,34 @@ getpkgver() { echo "$_ver" } +getpkgfile() { + if [[ ${#} -ne 1 ]]; then + echo 'ERROR: No canonical package found!' + exit 1 + elif [ ! -f "${1}" ]; then + echo "ERROR: Package ${1} not found!" + exit 1 + fi + + return ${1} +} + +getpkgfiles() { + if [ ! -z "$(echo ${(a)%\.*} | sed "s/ /\n/g" | sort | uniq -D)" ]; then + echo 'ERROR: Duplicate packages found!' + exit 1 + fi + + for f in ${@}; do + if [ ! -f "${f}" ]; then + echo "ERROR: Package ${f} not found!" + exit 1 + fi + done + + return ${@} +} + check_pkg_arch () { #check_pkg_arch pkgfile arch local _arch _arch="$(_grep_pkginfo "$1" "^arch")" diff --git a/db-move b/db-move index efd54e0..d405ef3 100755 --- a/db-move +++ b/db-move @@ -59,9 +59,7 @@ if [ -d "$packagebase/repos/$svnrepo_from" ]; then for i in ${pkgname[@]}; do _pkgfile="$i-$pkgver-$pkgrel-$_arch$PKGEXT" - if [ ! -f "$ftppath_from/${_arch}/$_pkgfile" ]; then - die "error: package file '$_pkgfile' not found in repo '$repofrom'" - fi + getpkgfile "$ftppath_from/${_arch}/"$_pkgfile done if [ -d "$packagebase/repos/$svnrepo_to" ]; then @@ -101,13 +99,13 @@ if [ -d "$packagebase/repos/$svnrepo_from" ]; then for i in ${pkgname[@]}; do _pkgfile="$i-$pkgver-$pkgrel-$_arch$PKGEXT" - /bin/cp "$ftppath_from/$architecture/$_pkgfile" . + /bin/cp $(getpkgfile "$ftppath_from/$architecture/"$_pkgfile) . /usr/bin/repo-add -q "$repoto$DBEXT" $_pkgfile || die "Error in repo-add $_pkgfile" done #use '*' to move the old DB too mv $repoto$DBEXT* $ftppath_to/$architecture for i in ${pkgname[@]}; do - _pkgfile="$i-$pkgver-$pkgrel-$_arch$PKGEXT" + _pkgfile=$(getpkgfile "$i-$pkgver-$pkgrel-$_arch"$PKGEXT) if [ "${_arch}" == "any" ]; then mv ${_pkgfile} $ftppath_to/any ln -s ../any/${_pkgfile} $ftppath_to/$architecture/ diff --git a/db-update b/db-update index 17d3b71..fc2bac6 100755 --- a/db-update +++ b/db-update @@ -89,7 +89,7 @@ done # Process architecture-independent packages first. if [ -d "$stagedir" ]; then - ANYPKGS="$(/bin/ls $stagedir/*-any$PKGEXT 2>/dev/null)" + ANYPKGS="$(getpkgfiles $stagedir/*-any$PKGEXT)" fi mkdir -p $WORKDIR @@ -155,7 +155,7 @@ for current_arch in ${ARCHES[@]}; do to_add="" if [ -d "$stagedir" ]; then - ADDPKGS="$(/bin/ls $stagedir/*-${current_arch}$PKGEXT 2>/dev/null)" + ADDPKGS="$(getpkgfiles $stagedir/*-${current_arch}$PKGEXT)" fi if [ -n "$ADDPKGS" -o -n "$ANYPKGS" ]; then @@ -186,7 +186,7 @@ for current_arch in ${ARCHES[@]}; do /usr/bin/svn up -q $_pkgbase if [ -d "$_pkgbase/repos/$svnrepo" ]; then . "$_pkgbase/repos/$svnrepo/$BUILDSCRIPT" - if [ "$_pkgfile" = "$_pkgname-$pkgver-$pkgrel-$current_arch$PKGEXT" ]; then + if echo "$_pkgfile" | grep -q "$_pkgname-$pkgver-$pkgrel-$current_arch"; then to_add="$to_add $pkg" else echo " WARNING: $_pkgfile does not match $BUILDSCRIPT in $svnrepo" @@ -216,7 +216,7 @@ for current_arch in ${ARCHES[@]}; do # if non empty, move all build dirs if [ $(/bin/ls "$WORKDIR/build/" 2>/dev/null | wc -l) != 0 ]; then - if [ $(/bin/ls "$WORKDIR/build/"*-$current_arch$PKGEXT 2>/dev/null | wc -l) != 0 ]; then + if [ $(getpkgfiles "$WORKDIR/build/"*-$current_arch$PKGEXT | wc -l) != 0 ]; then echo "Copying new files to '$ftppath'" for f in "$WORKDIR/build/"*-$current_arch$PKGEXT; do if ! /bin/cp "$f" "$ftppath/"; then @@ -224,7 +224,7 @@ for current_arch in ${ARCHES[@]}; do fi done fi - if [ $(/bin/ls "$WORKDIR/build/"*-any$PKGEXT 2>/dev/null | wc -l) != 0 ]; then + if [ $(getpkgfiles "$WORKDIR/build/"*-any$PKGEXT | wc -l) != 0 ]; then echo "Copying new files to '$ftppath_any' and symlinking" for f in "$WORKDIR/build/"*-any$PKGEXT; do if ! /bin/cp "$f" "$ftppath_any"; then -- 1.6.6.1 -- Pierre Schmitz, https://users.archlinux.de/~pierre

8 22

[arch-dev-public] [signoff] mkinitcpio 0.6.3-1
by Thomas Bächler 22 Feb '10

22 Feb '10

New release, please sign off. It has some bugfixes and a few nice changes under the hood. Shortlog: Benjamin Richter (2): Use only a single loop for searching /sys/block Use $(( )) instead of printf "%d" Thomas Bächler (18): Fix copyright in the README file If we could not mount the real root device, or the init program did not exist on it, bail out instead of panicing Add the "nfs" kernel module with in net hook Do not kill -9 udevd, instead kill -15 and wait for all processes to terminate before continuing Introduce mount handlers Remove the special handling for the default mount procedure, move it into a mount handler (default_mount_handler) Make indentation in two code blocks consistent When use stat -c %D instead of stat -f -c %i for testing if /new_root is a mount point launch_interactive_shell: add "export" for PS1 Improve sanity check: ${init} must be executable Fix NFS backward-compatibility with kinit Fix typo in 01cfe5572f6cfc172dddc013494511a59a7ed85f Cosmetic change: 'msg' function does not support '\n' load-modules.sh: Always use --use-blacklist default_mount_hook: Use major and minor variables instead of a single rootdev variable Allow the second parameter of poll_device to be 0 - this fixes rootdelay=0 poll_device: do not wait for a device to appear if udevd is not running Release 0.6.3

4 3

[arch-dev-public] [signoff] syslog-ng 3.0.4-2
by Paul Mattal 22 Feb '10

22 Feb '10

Please signoff, 1 for each arch. The only difference is that I've added /var/log/crond.log to the logrotate script so that its rotation is now handled when syslog-ng rotates all its logs. The benefit of this is that it's coordinated properly with the HUPping of syslog-ng, which is the actual creator of this log now that dcron logs to syslog. There is an intended overlap here. In order to ensure smooth migration of log rotation, the log will be "double covered" for a while (but logrotate detects this and ignores one of them) until I (shortly) push the dcron 4.4-2 which removes its own logrotate script for /var/log/crond.log. - P

2 2

[arch-dev-public] [signoff] nfs-utils-1.2.2-1
by Tobias Powalowski 22 Feb '10

22 Feb '10

Hi bump to latest version Please signoff both arches. greetings tpowa -- Tobias Powalowski Archlinux Developer & Package Maintainer (tpowa) http://www.archlinux.org tpowa(a)archlinux.org

2 1

[arch-dev-public] [IDEA] no packages older than one year in repos
by Allan McRae 21 Feb '10

21 Feb '10

Hi, This is an idea I have been thinking about for a while. One disadvantage of rolling release (at least with how we implement it), is that some packages do not get rebuilt in a long time. That can mean policy changes never get fully implemented (e.g. removal of .FILELIST from packages, moving man pages to /usr/share/man, LDFLAGS changes, arch=any, etc). Also, new toolchains bring new optimizations that are good to have. I would like to propose that we ensure no package in the repos goes unbuilt for more than a year. Looking at the current state of the repos, this should not be too much of a hassle once we catch up. There are about 12 packages in [core] and 120 packages in [extra] that currently have not been rebuild for more than a year. So, that indicates new packages to be rebuilt would occur at a rate of about two a week. If people like this idea, I can add the packages to the unimportant rebuild list wiki page (http://wiki.archlinux.org/index.php/DeveloperWiki:Unimportant_Rebuild_List) and gradually start doing to rebuilds. Once caught up, we can add a check to the integrity check script to catch new builds. Allan

6 7

[arch-dev-public] [signoff] zlib 1.2.3.8-1
by Pierre Schmitz 21 Feb '10

21 Feb '10

Here we have another release of zlib. The next one will probably be 1.2.4. Here is a changelog to 1.2.3.7: - Clean up text files (tabs, trailing whitespace, etc.) [Oberhumer] - Use z_off64_t in gz_zero() and gz_skip() to match state->skip - Avoid comparison problem when sizeof(int) == sizeof(z_off64_t) - Revert to Makefile.in from 1.2.3.6 (live with the clutter) - Fix missing error return in gzflush(), add zlib.h note - Add *64 functions to zlib.map [Levin] - Fix signed/unsigned comparison in gz_comp() - Use SFLAGS when testing shared linking in configure - Add --64 option to ./configure to use -m64 with gcc - Fix ./configure --help to correctly name options - Have make fail if a test fails [Levin] - Avoid buffer overrun in contrib/masmx64/gvmat64.asm [Simpson] - Remove assembler object files from contrib -- Pierre Schmitz, https://users.archlinux.de/~pierre

3 2

[arch-dev-public] [PATCH] mkarchroot: Added default pacman cache in usage help
by Eric Bélanger 21 Feb '10

21 Feb '10

Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- mkarchroot | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/mkarchroot b/mkarchroot index becb39e..208b144 100755 --- a/mkarchroot +++ b/mkarchroot @@ -26,7 +26,7 @@ usage() { echo ' -C <file> Location of a pacman config file' echo ' -M <file> Location of a makepkg config file' echo ' -n Do not copy config files into the chroot' - echo " -c <dir> Set pacman cache. Default: ${cache_dir}" + echo " -c <dir> Set pacman cache. Default: /var/cache/pacman/pkg" echo ' -h This message' exit $1 } -- 1.7.0

2 1

[arch-dev-public] [signoff] pciutils-3.1.7-1
by Tobias Powalowski 21 Feb '10

21 Feb '10

Hi bump to latest version. Please signoff both arches. greetings tpowa -- Tobias Powalowski Archlinux Developer & Package Maintainer (tpowa) http://www.archlinux.org tpowa(a)archlinux.org

3 2

[arch-dev-public] net-snmp 5.5 rebuild in [testing]
by Eric Bélanger 21 Feb '10

21 Feb '10

Hi, I've put net-snmp 5.5 in [testing]. It had a library soname bump so extra/fwbuilder extra/hplip extra/hpoj extra/libfwbuilder extra/php-snmp community/php52 community/rsyslog were rebuilt against it and are also in testing. Could someone (Allan? Pierre?) run the library check script to make sure I haven't forgot any? fwbuilder didn't explicitely listed the net-snmp dependency so there might be others. Old soname: /usr/lib/libnetsnmp.so.15 /usr/lib/libnetsnmpagent.so.15 /usr/lib/libnetsnmphelpers.so.15 /usr/lib/libnetsnmpmibs.so.15 /usr/lib/libnetsnmptrapd.so.15 /usr/lib/libsnmp.so.15 New soname: /usr/lib/libnetsnmp.so.20 /usr/lib/libnetsnmpagent.so.20 /usr/lib/libnetsnmphelpers.so.20 /usr/lib/libnetsnmpmibs.so.20 /usr/lib/libnetsnmptrapd.so.20 /usr/lib/libsnmp.so.20 BTW, I don't really use any of these packages so it would be great if the people who use them could test them and report any problems/success. Thanks, Eric

2 2

[arch-dev-public] [signoff] libarchive 2.8.0
by Dan McGee 20 Feb '10

20 Feb '10

New version in testing. Test using pacman or bsdtar. Upstream release notes: http://code.google.com/p/libarchive/wiki/ReleaseNotes -Dan

5 4