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

[arch-dev-public] [devtools] [PATCH] read {SRC, PKG}DEST from user makepkg.conf
by Andrea Scarpino 28 Jun '10

28 Jun '10

makechrootpkg does not read SRCDEST and PKGDEST if they are set in ~/.makepkg.conf -- Andrea `bash` Scarpino Arch Linux Developer

5 11

[arch-dev-public] [PATCH 1/3] sourceballs: Make cleanup more efficient
by Eric Bélanger 28 Jun '10

28 Jun '10

Moved all cleanup related code in sourceballs-cleanup script and moved, now common, functions in db-functions. The cleanup script is now ran after all the new sourceballs have been fetched. Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- cron-jobs/sourceballs | 2 + db-functions | 21 ++++++++ misc-scripts/make-sourceball | 54 --------------------- misc-scripts/sourceballs-cleanup | 95 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 118 insertions(+), 54 deletions(-) create mode 100755 misc-scripts/sourceballs-cleanup diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs index b7a4885..ccb00ad 100755 --- a/cron-jobs/sourceballs +++ b/cron-jobs/sourceballs @@ -89,4 +89,6 @@ if [ -n "$FAILED_PKGS" ]; then echo -e $FAILED_PKGS | sed "s| |\n|g" | sort -u >> "$srcbase/failed.txt" fi +$dirname/../misc-scripts/sourceballs-cleanup + cleanup diff --git a/db-functions b/db-functions index a4cffd7..ecf53d9 100644 --- a/db-functions +++ b/db-functions @@ -126,4 +126,25 @@ chk_license() { return 1 } +pkgname_from_src() { + local tmp + tmp=${1##*/} + tmp=${tmp%$SRCEXT} + for a in ${ARCHES[@]}; do + tmp=${tmp%-$a} + done + tmp=${tmp%-any} + echo ${tmp%-*-*} +} + +pkgver_from_src() { + tmp=${1##*/} + tmp=${tmp%$SRCEXT} + for a in ${ARCHES[@]}; do + tmp=${tmp%-$a} + done + tmp=${tmp%-any} + echo $tmp | sed 's|.*-$.*-.*$$|\1|g' +} + # vim: set ts=4 sw=4 noet ft=sh: diff --git a/misc-scripts/make-sourceball b/misc-scripts/make-sourceball index 8899fca..610d7f1 100755 --- a/misc-scripts/make-sourceball +++ b/misc-scripts/make-sourceball @@ -40,27 +40,6 @@ die() { cleanup 1 } -pkgname_from_src() { - local tmp - tmp=${1##*/} - tmp=${tmp%$SRCEXT} - for a in ${ARCHES[@]}; do - tmp=${tmp%-$a} - done - tmp=${tmp%-any} - echo ${tmp%-*-*} -} - -pkgver_from_src() { - tmp=${1##*/} - tmp=${tmp%$SRCEXT} - for a in ${ARCHES[@]}; do - tmp=${tmp%-$a} - done - tmp=${tmp%-any} - echo $tmp | sed 's|.*-$.*-.*$$|\1|g' -} - create_srcpackage() { if [ -d "$1" ]; then pushd "$1" >/dev/null @@ -94,38 +73,6 @@ create_srcpackage() { fi } -remove_old() { - if [ -d "$1" ]; then - pushd "$1" >/dev/null - PKGVERS="" - for repo in *; do - cd "$repo" - . "$BUILDSCRIPT" - PKGVERS="$PKGVERS $pkgver-$pkgrel" - cd .. - done - - for srcpkg in "$srcpath/$packagename-"*; do - [ -f "$srcpkg" ] || continue - if [ "$(pkgname_from_src $srcpkg)" == "$packagename" ]; then - skip=0 - pver="$(pkgver_from_src $srcpkg)" - for v in $PKGVERS; do - if [ "$v" = "$pver" ]; then - skip=1 - break - fi - done - if [ $skip -ne 1 ]; then - mv "$srcpkg" $SOURCE_CLEANUP_DESTDIR - fi - fi - done - - popd >/dev/null - fi -} - trap ctrl_c 2 trap cleanup 0 1 @@ -135,7 +82,6 @@ set_umask cd "$WORKDIR" if /usr/bin/svn export -q "$SVNREPO/$packagename" $packagename; then - remove_old "$packagename/repos/" create_srcpackage "$packagename/repos/$reponame-$_arch" else die "\tPackage '$packagename' does not exist in repo '$reponame-$_arch'" diff --git a/misc-scripts/sourceballs-cleanup b/misc-scripts/sourceballs-cleanup new file mode 100755 index 0000000..0a1ac4d --- /dev/null +++ b/misc-scripts/sourceballs-cleanup @@ -0,0 +1,95 @@ +#!/bin/bash + +. "$(dirname $0)/../db-functions" +. "$(dirname $0)/../config" + +srcpath="$FTP_BASE/sources/" +logfile="$srcpath/cleanup.txt" + +LOCKFILE="/tmp/.sourceball-cleanup.lock" +WORKDIR="/tmp/sourceball-cleanup.$packagename.$UID" + +cleanup () { + restore_umask + rm -rf "$WORKDIR" + rm -f "$LOCKFILE" + exit 0 +} + +ctrl_c() { + echo "Interrupted" >&2 + cleanup 0 +} + +remove_old() { + if [ -d "$1" ]; then + pushd "$1" >/dev/null + PKGVERS="" + for repo in *; do + cd "$repo" + . "$BUILDSCRIPT" + PKGVERS="$PKGVERS $pkgver-$pkgrel" + cd .. + done + + for srcpkg in "$srcpath/$packagename-"*; do + [ -f "$srcpkg" ] || continue + if [ "$(pkgname_from_src $srcpkg)" == "$packagename" ]; then + skip=0 + pver="$(pkgver_from_src $srcpkg)" + for v in $PKGVERS; do + if [ "$v" = "$pver" ]; then + skip=1 + break + fi + done + if [ $skip -ne 1 ]; then + mv "$srcpkg" $SOURCE_CLEANUP_DESTDIR + fi + fi + done + + popd >/dev/null + fi +} + +if [ -f "$LOCKFILE" ]; then + owner="$(/usr/bin/stat -c %U $LOCKFILE)" + echo "error: source tarball generation is already in progress (started by $owner)" + exit 1 +fi + +trap cleanup 0 +trap ctrl_c 2 + +/bin/touch "$LOCKFILE" + +#adjust the nice level to run at a lower priority +/usr/bin/renice +10 -p $$ > /dev/null + +set_umask +/bin/mkdir -p "$WORKDIR" +cd "$WORKDIR" + +[ -e "$logfile" ] && /bin/mv "$logfile" "$logfile.old" +echo "Orphaned sourceballs:" > "$logfile" + +for sourceball in "$srcpath"/*$SRCEXT; do + packagename=$(basename $sourceball) + packagename=${packagename%-*-*$SRCEXT} + + if ! /usr/bin/svn export -q --force "$SVNREPO/$packagename" "$packagename" >/dev/null 2>&1 ; then + echo "$packagename : no longer in svn. Removing sourceball." >> "$logfile" + mv $sourceball $SOURCE_CLEANUP_DESTDIR + elif [ -z "$(ls -A "$packagename/repos")" ]; then + echo "$packagename : no longer in repos but trunk is still in svn. Removing sourceball." >> "$logfile" + mv $sourceball $SOURCE_CLEANUP_DESTDIR + elif ! source "$packagename/trunk/$BUILDSCRIPT" && chk_license ${license[@]}; then + echo "$packagename : source hosting no longer required by license. Removing sourceball." >> "$logfile" + mv $sourceball $SOURCE_CLEANUP_DESTDIR + else + remove_old "$packagename/repos/" + fi +done + +cleanup 0 -- 1.6.6.1

4 10

[arch-dev-public] dbscripts pkg pools
by Aaron Griffin 22 Jun '10

22 Jun '10

Hello all, I've had these patches sitting around for a bit: http://code.phraktured.net/cgit.cgi/dbscripts/log/?h=pkgpools I'd like to see if someone else has the time to test them. I have tested them with the following procedure: * created ./testing/{staging,myrepo,packages,package-cleanup}/ with necessary subdirs * modified config to point to these paths * commented out all the SVN malarky in db-add/db-remove/ftpdir-cleanup/etc * changed get_repos_for_host() to return "myrepo" Testing: * Add a package to myrepo - Package file in packages/os/*/ - Relative symlink in myrepo/os/*/ - In myrepo DB * Remove package from repo 'foo' - Removed from myrepo DB * Run cron-jobs/ftpdir-cleanup - Symlink is removed from myrepo/os/*/ - Package file moved from packages/os/*/ to package-cleanup/ Anyone else want to verify this, or should I push it to master? Aside: Would it be a good idea to add a "svn" function which could: a) handle svn checkout failures (we don't, right now) b) be easily switched out for dry-run style testing

6 31

[arch-dev-public] Website updated- package maintainer changes
by Dan McGee 13 May '10

13 May '10

Hey guys, I just pushed a website update today that improves something everyone has been clamoring for- package maintainers. The quick hits: * Package maintainership is now by 'pkgbase'. If you "adopt" one package, you become a maintainer for all packages with that same pkgbase (including across all architectures). This also means when a package is converted from arch-specific to arch-independent, you won't have to re-adopt it. * We will never lose package maintainer info if we lose packages and they come back in a later processing of the DB. Eric will be glad to hear this. * Multiple maintainers are supported. See http://www.archlinux.org/packages/extra/x86_64/thunderbird/ for an example. All maintainers will get an email when the package is marked out of date (if they are signed up to do so). With all that said, the concept of package adoption is now not an exclusive affair- multiple people can adopt packages and all be listed as maintainers. Let me (and the list) know if you have any questions. -Dan

7 11

Re: [arch-dev-public] past DEVs/TUs listed in Maintainer window
by Dan McGee 04 May '10

04 May '10

On Tue, Apr 13, 2010 at 7:47 AM, Andrea Scarpino <andrea(a)archlinux.org> wrote: > Hi Dan, > I saw we have more ex-developers or ex-trusted users listed in Maintainer > window selection. > > I think you could remove these: > abhidg > alexander > alexanderf > arjant > aurelien > cprimier > damir > don > dorphell > douglas > dusty > eduardo > eliott > geoffroy > jason > jeff > judd > phil > pmatias > schiv > simo > tom > travis > varun This is automatic and shows all users in the system right now. What should we be showing? Getting your web user turned off doesn't auto-orphan your packages, so I'm hesitant to drop all old users here. -Dan

3 4

[arch-dev-public] [signoff] cracklib-2.8.13-3
by Allan McRae 04 May '10

04 May '10

Rebuild to remove from base group. Previous package was over a year old. Signoff both, Allan

5 5

[arch-dev-public] [signoff] b43-fwcutter-012-1
by Tobias Powalowski 02 May '10

02 May '10

Hi bumped 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 4

[arch-dev-public] [signoff] linux-atm 2.5.1-1
by Tobias Powalowski 02 May '10

02 May '10

Hi guys, 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

1 1

[arch-dev-public] Integrity Check x86_64: core, extra, community 30-04-2010
by repomaint＠archlinux.org 30 Apr '10

30 Apr '10

================================================== = Integrity Check x86_64 of core,extra,community = ================================================== Performing integrity checks... ==> parsing pkgbuilds ==> parsing db files ==> checking mismatches ==> checking archs ==> checking dependencies ==> checking makedepends ==> checking hierarchy ==> checking for circular dependencies ==> checking for differences between db files and pkgbuilds Duplicate PKGBUILDs --------------------- /srv/abs/rsync/x86_64/extra/vim vs. /srv/abs/rsync/x86_64/extra/gvim Missing Dependencies ---------------------- community/airsnort --> 'wlan-ng26-utils' community/sysprof-module --> 'kernel26<2.6.' Missing Makedepends --------------------- core/dash --> 'klibc>=1.5' extra/v86d --> 'kernel26<2.6.33' Repo Hierarchy for Dependencies --------------------------------- extra/pan depends on community/gmime22 (0 extra (make)deps to pull) Repo Hierarchy for Makedepends -------------------------------- core/ca-certificates depends on extra/python (25 extra (make)deps to pull) core/ca-certificates depends on extra/ruby (25 extra (make)deps to pull) core/crda depends on extra/python-m2crypto (26 extra (make)deps to pull) core/e2fsprogs depends on extra/bc (0 extra (make)deps to pull) core/groff depends on extra/ghostscript (137 extra (make)deps to pull) core/groff depends on extra/netpbm (45 extra (make)deps to pull) core/groff depends on extra/psutils (138 extra (make)deps to pull) core/iputils depends on extra/docbook-xsl (26 extra (make)deps to pull) core/iputils depends on extra/libxslt (25 extra (make)deps to pull) core/iputils depends on extra/opensp (30 extra (make)deps to pull) core/sqlite3 depends on extra/tcl (0 extra (make)deps to pull) core/udev depends on extra/gobject-introspection (39 extra (make)deps to pull) core/udev depends on extra/gperf (0 extra (make)deps to pull) core/udev depends on extra/libxslt (25 extra (make)deps to pull) core/udev-compat depends on extra/gobject-introspection (39 extra (make)deps to pull) core/udev-compat depends on extra/gperf (0 extra (make)deps to pull) core/udev-compat depends on extra/libxslt (25 extra (make)deps to pull) extra/bigloo depends on community/jdk (1 extra (make)deps to pull : jre) extra/dbus-python depends on community/docutils (0 extra (make)deps to pull) extra/gnome-speech depends on community/espeak (2 extra (make)deps to pull : portaudio docutils) extra/grml-zsh-config depends on community/txt2tags (0 extra (make)deps to pull) extra/opengtl depends on community/llvm (0 extra (make)deps to pull) extra/vigra depends on community/python-sphinx (3 extra (make)deps to pull : pygments docutils python-jinja) extra/xqf depends on community/chrpath (0 extra (make)deps to pull) Packages found in db, but not in tree --------------------------------------- community/perl-unicode-stringprep core/procinfo extra/kde-l10n-sv Packages found in tree, but not in db --------------------------------------- extra/vim-runtime Summary --------- Missing PKGBUILDs: 0 Invalid PKGBUILDs: 0 Mismatching PKGBUILD names: 0 Duplicate PKGBUILDs: 1 Invalid archs: 0 Missing (make)dependencies: 4 Repo hierarchy problems: 25 Circular dependencies: 0 In db, but not in tree: 3 In tree, but not in db: 1

1 0

[arch-dev-public] Integrity Check i686: core, extra, community 30-04-2010
by repomaint＠archlinux.org 30 Apr '10

30 Apr '10

================================================ = Integrity Check i686 of core,extra,community = ================================================ Performing integrity checks... ==> parsing pkgbuilds ==> parsing db files ==> checking mismatches ==> checking archs ==> checking dependencies ==> checking makedepends ==> checking hierarchy ==> checking for circular dependencies ==> checking for differences between db files and pkgbuilds Duplicate PKGBUILDs --------------------- /srv/abs/rsync/i686/extra/qtscriptgenerator vs. /srv/abs/rsync/i686/core/qtscriptgenerator /srv/abs/rsync/i686/extra/vim vs. /srv/abs/rsync/i686/extra/gvim Missing Dependencies ---------------------- community/airsnort --> 'wlan-ng26-utils' community/sysprof-module --> 'kernel26<2.6.' Missing Makedepends --------------------- core/dash --> 'klibc>=1.5' extra/v86d --> 'kernel26<2.6.33' Repo Hierarchy for Dependencies --------------------------------- core/qtscriptgenerator depends on extra/phonon (218 extra (make)deps to pull) core/qtscriptgenerator depends on extra/qt (135 extra (make)deps to pull) extra/pan depends on community/gmime22 (0 extra (make)deps to pull) Repo Hierarchy for Makedepends -------------------------------- core/ca-certificates depends on extra/python (25 extra (make)deps to pull) core/ca-certificates depends on extra/ruby (25 extra (make)deps to pull) core/crda depends on extra/python-m2crypto (26 extra (make)deps to pull) core/e2fsprogs depends on extra/bc (0 extra (make)deps to pull) core/groff depends on extra/ghostscript (137 extra (make)deps to pull) core/groff depends on extra/netpbm (45 extra (make)deps to pull) core/groff depends on extra/psutils (138 extra (make)deps to pull) core/iputils depends on extra/docbook-xsl (26 extra (make)deps to pull) core/iputils depends on extra/libxslt (25 extra (make)deps to pull) core/iputils depends on extra/opensp (30 extra (make)deps to pull) core/qtscriptgenerator depends on extra/mesa (38 extra (make)deps to pull) core/sqlite3 depends on extra/tcl (0 extra (make)deps to pull) core/udev depends on extra/gobject-introspection (39 extra (make)deps to pull) core/udev depends on extra/gperf (0 extra (make)deps to pull) core/udev depends on extra/libxslt (25 extra (make)deps to pull) core/udev-compat depends on extra/gobject-introspection (39 extra (make)deps to pull) core/udev-compat depends on extra/gperf (0 extra (make)deps to pull) core/udev-compat depends on extra/libxslt (25 extra (make)deps to pull) extra/bigloo depends on community/jdk (1 extra (make)deps to pull : jre) extra/dbus-python depends on community/docutils (0 extra (make)deps to pull) extra/gnome-speech depends on community/espeak (2 extra (make)deps to pull : portaudio docutils) extra/grml-zsh-config depends on community/txt2tags (0 extra (make)deps to pull) extra/opengtl depends on community/llvm (0 extra (make)deps to pull) extra/vigra depends on community/python-sphinx (3 extra (make)deps to pull : pygments docutils python-jinja) extra/xqf depends on community/chrpath (0 extra (make)deps to pull) Packages found in db, but not in tree --------------------------------------- community/perl-unicode-stringprep core/procinfo extra/kde-l10n-sv extra/qtscriptgenerator Packages found in tree, but not in db --------------------------------------- core/qtscriptgenerator extra/vim-runtime Summary --------- Missing PKGBUILDs: 0 Invalid PKGBUILDs: 0 Mismatching PKGBUILD names: 0 Duplicate PKGBUILDs: 2 Invalid archs: 0 Missing (make)dependencies: 4 Repo hierarchy problems: 28 Circular dependencies: 0 In db, but not in tree: 4 In tree, but not in db: 2

1 0