- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] NEWS update for pacman-3.4
by Allan McRae 03 Jun '10

03 Jun '10

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- NEWS | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/NEWS b/NEWS index 743028c..2fdada6 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,42 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +3.4.0 - new "Architecture" option that will restrict pacman to + installing only packages from the given architecture. Can be + set to "auto" in which case the output of "uname -m" is used + - use "$arch" when specifing a mirror url to automatically + select the correct architecture + - Installing packages with -U can handle installing + dependencies, confict resolution and replacing packages + - can upgrage the system and install a new package using + "pacman -Syu <pkg>" + - new -D/--database operation for modifying package install + reasons + - new --print and --print-format options to output information + in suitable format for wrapper scripts + - only extract new entries when updating a repo database + - show "Required by" in -Sii output + - -U and -R options always ask for confirmation + - allow -Qo to perform a functional 'which' + - cache cleaning cleans all directories, not just first + - cleanupdelta: new utility to help remove unused deltas from + a repo database + - repo-add: handle removing the final package from a repo + - rankmirrors: rewrite using bash + - vercmp: does not link to libalpm to prevent upgrade issues + - makepkg: + - automatically aborts of any errors during packaging + - changelogs are now included via the "changelog" variable + - can override pkgver, pkgrel and arch in split packages + - repackaging without a package() function is depricated + - stricter syntax checking for backup and optdepends entries + - file stripping options are configurable + - New --pkg flag to allow building specific package(s) from + split PKGBUILDs. + - build() function is now optional + - warns about reference to the build root in a package + - configure source package destination with SRCPKGDEST + - major internal refactor of handling tests ("[" to "[[") + - contrib/pactree: print reverse dependency tree 3.3.3 - correctly check the return code from opendir() - fix possible infinite loop in alpm_list_remove() - makepkg: -- 1.7.1

3 5

[pacman-dev] Any reason to keep gensync/updatesync?
by Dan McGee 03 Jun '10

03 Jun '10

gensync and updatesync are two scripts that have been rotting in contrib/ for a few years now. For those that haven't been around as long, they were the predecessors of repo-add/repo-remove. At this point I think they have outlived their usefulness and I can't even claim to know if they work anymore. Any reason to keep them? If no one objects I'll patch them dead before the 3.4 release. -Dan

2 1

[pacman-dev] [PATCH] Remove DBEXT usage
by Allan McRae 03 Jun '10

03 Jun '10

With commit 5dffef78, the repo database always has a symlink of the form reponame.db. Use that filename and let libarchive determine the compression type. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Definitely not for the 3.4 release configure.ac | 9 --------- lib/libalpm/be_files.c | 8 ++++---- scripts/Makefile.am | 1 - scripts/rankmirrors.sh.in | 2 +- test/pacman/pmdb.py | 2 +- test/pacman/pmtest.py | 2 +- test/pacman/util.py | 1 - 7 files changed, 7 insertions(+), 18 deletions(-) diff --git a/configure.ac b/configure.ac index 3e11f8c..37881e6 100644 --- a/configure.ac +++ b/configure.ac @@ -83,11 +83,6 @@ AC_ARG_WITH(src-ext, AS_HELP_STRING([--with-src-ext=ext], [set the file extension used by source packages]), [SRCEXT=$withval], [SRCEXT=.src.tar.gz]) -# Help line for database extension -AC_ARG_WITH(db-ext, - AS_HELP_STRING([--with-db-ext=ext], [set the file extension used by the database]), - [DBEXT=$withval], [DBEXT=.db.tar.gz]) - # Help line for buildscript filename AC_ARG_WITH(buildscript, AS_HELP_STRING([--with-buildscript=name], [set the build script name used by makepkg]), @@ -337,9 +332,6 @@ AC_DEFINE_UNQUOTED([PKGEXT], "$PKGEXT", [The file extension used by pacman packa # Set source package file extension AC_SUBST(SRCEXT) AC_DEFINE_UNQUOTED([SRCEXT], "$SRCEXT", [The file extension used by pacman source packages]) -# Set database file extension -AC_SUBST(DBEXT) -AC_DEFINE_UNQUOTED([DBEXT], "$DBEXT", [The file extension used by pacman databases]) # Set makepkg build script name AC_SUBST(BUILDSCRIPT) AC_DEFINE_UNQUOTED([BUILDSCRIPT], "$BUILDSCRIPT", [The build script name used by makepkg]) @@ -391,7 +383,6 @@ ${PACKAGE_NAME}: root working directory : ${ROOTDIR} package extension : ${PKGEXT} source pkg extension : ${SRCEXT} - database extension : ${DBEXT} build script name : ${BUILDSCRIPT} Compilation options: diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index 877bc50..c26bef2 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -231,9 +231,9 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) RET_ERR(PM_ERR_DB_NOT_FOUND, -1); } - len = strlen(db->treename) + strlen(DBEXT) + 1; + len = strlen(db->treename) + 4; MALLOC(dbfile, len, RET_ERR(PM_ERR_MEMORY, -1)); - sprintf(dbfile, "%s" DBEXT, db->treename); + sprintf(dbfile, "%s.db", db->treename); dbpath = alpm_option_get_dbpath(); @@ -253,9 +253,9 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) syncdbpath = _alpm_db_path(db); /* form the path to the db location */ - len = strlen(dbpath) + strlen(db->treename) + strlen(DBEXT) + 1; + len = strlen(dbpath) + strlen(db->treename) + 4; MALLOC(dbfilepath, len, RET_ERR(PM_ERR_MEMORY, -1)); - sprintf(dbfilepath, "%s%s" DBEXT, dbpath, db->treename); + sprintf(dbfilepath, "%s%s.db", dbpath, db->treename); if(force) { /* if forcing update, remove the old dir and extract the db */ diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 330acb9..0197d9e 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -38,7 +38,6 @@ edit = sed \ -e 's|@PACKAGE_VERSION[@]|$(REAL_PACKAGE_VERSION)|g' \ -e 's|@PACKAGE_BUGREPORT[@]|$(PACKAGE_BUGREPORT)|g' \ -e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \ - -e 's|@DBEXT[@]|$(DBEXT)|g' \ -e 's|@BUILDSCRIPT[@]|$(BUILDSCRIPT)|g' \ -e 's|@SIZECMD[@]|$(SIZECMD)|g' \ -e 's|@SEDINPLACE[@]|$(SEDINPLACE)|g' \ diff --git a/scripts/rankmirrors.sh.in b/scripts/rankmirrors.sh.in index 9b4e973..28c3a7c 100644 --- a/scripts/rankmirrors.sh.in +++ b/scripts/rankmirrors.sh.in @@ -85,7 +85,7 @@ getfetchurl() { if [[ -z $reponame || $reponame = $replacedurl ]]; then echo "fail" else - local fetchurl="${replacedurl}/$reponame@DBEXT@" + local fetchurl="${replacedurl}/$reponame.db" echo "$fetchurl" fi } diff --git a/test/pacman/pmdb.py b/test/pacman/pmdb.py index 8cb1b83..41bd738 100755 --- a/test/pacman/pmdb.py +++ b/test/pacman/pmdb.py @@ -344,7 +344,7 @@ def gensync(self, path): # Generate database archive mkdir(path) - archive = os.path.join(path, "%s%s" % (self.treename, PM_EXT_DB)) + archive = os.path.join(path, "%s.db" % (self.treename)) tar = tarfile.open(archive, "w:gz") for root, dirs, files in os.walk('.'): for d in dirs: diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py index f2b9676..b1d778e 100755 --- a/test/pacman/pmtest.py +++ b/test/pacman/pmtest.py @@ -149,7 +149,7 @@ def generate(self): vprint(" Creating sync database archives") for key, value in self.db.iteritems(): if key == "local": continue - archive = value.treename + PM_EXT_DB + archive = value.treename + ".db" vprint("\t" + os.path.join(SYNCREPO, archive)) value.gensync(os.path.join(syncdir, value.treename)) diff --git a/test/pacman/util.py b/test/pacman/util.py index e01a3b8..657230e 100755 --- a/test/pacman/util.py +++ b/test/pacman/util.py @@ -28,7 +28,6 @@ PM_LOCK = "var/lib/pacman/db.lck" PM_CACHEDIR = "var/cache/pacman/pkg" PM_EXT_PKG = ".pkg.tar.gz" -PM_EXT_DB = ".db.tar.gz" PM_PACNEW = ".pacnew" PM_PACORIG = ".pacorig" PM_PACSAVE = ".pacsave" -- 1.7.1

3 4

[pacman-dev] [PATCH] [Idea] makepkg: Extract from any file bsdtar can recognize
by Nezmer 03 Jun '10

03 Jun '10

If "file -bizL" does not return a supported type. Check if the dist file is recognized by bsdtar and if yes extract from it. Signed-off-by: Nezmer <git(a)nezmer.info> --- bsdtar can recognize many containers and compression algorithms. lzma is the best compression the GNU guys are using in their dist files. % file -bizL wget-1.12.tar.lzma application/octet-stream; charset=binary "file" output is not really useful. Using lzma can reduce the size of source packages by a good margin. scripts/makepkg.sh.in | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 76b6183..71b87ff 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -685,9 +685,12 @@ extract_sources() { *) continue;; esac ;; *) - # Don't know what to use to extract this file, - # skip to the next file - continue;; + # Check If bsdtar can recognize the file + if bsdtar -tf "$file" &>/dev/null; then + cmd="bsdtar" + else + continue + fi ;; esac local ret=0 -- 1.7.1

5 14

[pacman-dev] String freeze for 3.4 coming soon
by Dan McGee 03 Jun '10

03 Jun '10

Just a heads up that we are going to do the string freeze for the pacman 3.4 release in the next couple of days, so this is a heads up to anyone that is involved in helping translate pacman. Allan and I are looking at a few more patches that might have string changes and then we will be good to go. Those who have helped out in the past with either translation or coordination, I hope you are still willing and ready to help out. :) -Dan

3 3

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-203-g0ac96d9
by dan＠archlinux.org 02 Jun '10

02 Jun '10

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 0ac96d94ec3a8a2f3a3857810dbd9109c5cd3235 (commit) via 844d82fad811626b0b8e54db60ee4b3ea32a3cb9 (commit) via ccea1b55766200c1ab371cf0f3b38c4cebdb2063 (commit) via 2710b256cc260db6a0805c83fb3fcf9e32aa3d86 (commit) from 5dffef787df72cc407708242d14f07496bb37791 (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 0ac96d94ec3a8a2f3a3857810dbd9109c5cd3235 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jun 2 13:24:22 2010 -0500 Move vercmp tests into util/ testing directory Now that not everything is in 'pactest/', we can separate out the parts a bit more and leave the pacman/ directory to be just pactest. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 844d82fad811626b0b8e54db60ee4b3ea32a3cb9 Author: Allan McRae <allan(a)archlinux.org> Date: Sun May 30 14:41:59 2010 +1000 Move pacman test suite Move the test suite to test/pacman in order to make a logical location for a future makepkg test suite. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ccea1b55766200c1ab371cf0f3b38c4cebdb2063 Author: Allan McRae <allan(a)archlinux.org> Date: Sun May 30 10:18:00 2010 +1000 Fix typo in pactest Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2710b256cc260db6a0805c83fb3fcf9e32aa3d86 Author: Allan McRae <allan(a)archlinux.org> Date: Sat May 29 11:17:10 2010 +1000 Remove unnecessary error catching from PKGBUILD protos The use of "|| return 1" is no longer necessary in PKGBUILDs. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 10 +++++----- PKGBUILD-split.proto | 2 +- PKGBUILD.proto | 2 +- autoclean.sh | 4 ++-- configure.ac | 4 ++-- {pactest => test/pacman}/.gitignore | 0 {pactest => test/pacman}/ChangeLog | 0 {pactest => test/pacman}/Makefile.am | 3 +-- {pactest => test/pacman}/README | 0 {pactest => test/pacman}/TODO | 0 {pactest => test/pacman}/pactest.py | 0 {pactest => test/pacman}/pmdb.py | 0 {pactest => test/pacman}/pmenv.py | 0 {pactest => test/pacman}/pmfile.py | 0 {pactest => test/pacman}/pmpkg.py | 0 {pactest => test/pacman}/pmrule.py | 0 {pactest => test/pacman}/pmtest.py | 0 {pactest => test/pacman}/tests/.gitignore | 0 {pactest => test/pacman}/tests/Makefile.am | 0 {pactest => test/pacman}/tests/config001.py | 0 {pactest => test/pacman}/tests/config002.py | 0 {pactest => test/pacman}/tests/database001.py | 0 {pactest => test/pacman}/tests/database002.py | 0 {pactest => test/pacman}/tests/database010.py | 0 {pactest => test/pacman}/tests/database011.py | 0 {pactest => test/pacman}/tests/database012.py | 0 {pactest => test/pacman}/tests/depconflict100.py | 0 {pactest => test/pacman}/tests/depconflict110.py | 0 {pactest => test/pacman}/tests/depconflict111.py | 0 {pactest => test/pacman}/tests/depconflict120.py | 0 {pactest => test/pacman}/tests/deptest001.py | 0 {pactest => test/pacman}/tests/dummy001.py | 0 {pactest => test/pacman}/tests/fileconflict001.py | 0 {pactest => test/pacman}/tests/fileconflict002.py | 0 {pactest => test/pacman}/tests/fileconflict003.py | 0 {pactest => test/pacman}/tests/fileconflict004.py | 0 {pactest => test/pacman}/tests/fileconflict005.py | 0 {pactest => test/pacman}/tests/fileconflict006.py | 0 {pactest => test/pacman}/tests/fileconflict007.py | 0 {pactest => test/pacman}/tests/ignore001.py | 0 {pactest => test/pacman}/tests/ignore002.py | 0 {pactest => test/pacman}/tests/ignore003.py | 0 {pactest => test/pacman}/tests/ignore004.py | 0 {pactest => test/pacman}/tests/ignore005.py | 0 {pactest => test/pacman}/tests/ldconfig001.py | 0 {pactest => test/pacman}/tests/ldconfig002.py | 0 {pactest => test/pacman}/tests/ldconfig003.py | 0 {pactest => test/pacman}/tests/mode001.py | 0 {pactest => test/pacman}/tests/mode002.py | 0 {pactest => test/pacman}/tests/mode003.py | 0 {pactest => test/pacman}/tests/pacman001.py | 0 {pactest => test/pacman}/tests/pacman002.py | 0 {pactest => test/pacman}/tests/pacman003.py | 0 {pactest => test/pacman}/tests/pacman004.py | 0 {pactest => test/pacman}/tests/provision001.py | 0 {pactest => test/pacman}/tests/provision010.py | 0 {pactest => test/pacman}/tests/provision011.py | 0 {pactest => test/pacman}/tests/provision012.py | 0 {pactest => test/pacman}/tests/provision020.py | 0 {pactest => test/pacman}/tests/provision021.py | 0 {pactest => test/pacman}/tests/provision022.py | 0 {pactest => test/pacman}/tests/query001.py | 0 {pactest => test/pacman}/tests/query002.py | 0 {pactest => test/pacman}/tests/query003.py | 0 {pactest => test/pacman}/tests/query004.py | 0 {pactest => test/pacman}/tests/query005.py | 0 {pactest => test/pacman}/tests/reason001.py | 0 {pactest => test/pacman}/tests/remove001.py | 2 +- {pactest => test/pacman}/tests/remove010.py | 0 {pactest => test/pacman}/tests/remove011.py | 0 {pactest => test/pacman}/tests/remove020.py | 0 {pactest => test/pacman}/tests/remove021.py | 0 {pactest => test/pacman}/tests/remove030.py | 0 {pactest => test/pacman}/tests/remove040.py | 0 {pactest => test/pacman}/tests/remove041.py | 0 {pactest => test/pacman}/tests/remove042.py | 0 {pactest => test/pacman}/tests/remove043.py | 0 {pactest => test/pacman}/tests/remove044.py | 0 {pactest => test/pacman}/tests/remove045.py | 0 {pactest => test/pacman}/tests/remove047.py | 0 {pactest => test/pacman}/tests/remove049.py | 0 {pactest => test/pacman}/tests/remove050.py | 0 {pactest => test/pacman}/tests/remove051.py | 0 {pactest => test/pacman}/tests/remove052.py | 0 {pactest => test/pacman}/tests/remove060.py | 0 {pactest => test/pacman}/tests/scriptlet001.py | 0 {pactest => test/pacman}/tests/scriptlet002.py | 0 {pactest => test/pacman}/tests/smoke001.py | 0 {pactest => test/pacman}/tests/symlink001.py | 0 {pactest => test/pacman}/tests/sync001.py | 0 {pactest => test/pacman}/tests/sync002.py | 0 {pactest => test/pacman}/tests/sync003.py | 0 {pactest => test/pacman}/tests/sync009.py | 0 {pactest => test/pacman}/tests/sync010.py | 0 {pactest => test/pacman}/tests/sync011.py | 0 {pactest => test/pacman}/tests/sync012.py | 0 {pactest => test/pacman}/tests/sync020.py | 0 {pactest => test/pacman}/tests/sync021.py | 0 {pactest => test/pacman}/tests/sync030.py | 0 {pactest => test/pacman}/tests/sync031.py | 0 {pactest => test/pacman}/tests/sync040.py | 0 {pactest => test/pacman}/tests/sync041.py | 0 {pactest => test/pacman}/tests/sync042.py | 0 {pactest => test/pacman}/tests/sync043.py | 0 {pactest => test/pacman}/tests/sync044.py | 0 {pactest => test/pacman}/tests/sync045.py | 0 {pactest => test/pacman}/tests/sync050.py | 0 {pactest => test/pacman}/tests/sync100.py | 0 {pactest => test/pacman}/tests/sync1000.py | 0 {pactest => test/pacman}/tests/sync1003.py | 0 {pactest => test/pacman}/tests/sync1004.py | 0 {pactest => test/pacman}/tests/sync1008.py | 0 {pactest => test/pacman}/tests/sync101.py | 0 {pactest => test/pacman}/tests/sync102.py | 0 {pactest => test/pacman}/tests/sync103.py | 0 {pactest => test/pacman}/tests/sync104.py | 0 {pactest => test/pacman}/tests/sync110.py | 0 {pactest => test/pacman}/tests/sync1100.py | 0 {pactest => test/pacman}/tests/sync1101.py | 0 {pactest => test/pacman}/tests/sync1102.py | 0 {pactest => test/pacman}/tests/sync1103.py | 0 {pactest => test/pacman}/tests/sync120.py | 0 {pactest => test/pacman}/tests/sync130.py | 0 {pactest => test/pacman}/tests/sync131.py | 0 {pactest => test/pacman}/tests/sync132.py | 0 {pactest => test/pacman}/tests/sync133.py | 0 {pactest => test/pacman}/tests/sync134.py | 0 {pactest => test/pacman}/tests/sync135.py | 0 {pactest => test/pacman}/tests/sync136.py | 0 {pactest => test/pacman}/tests/sync137.py | 0 {pactest => test/pacman}/tests/sync138.py | 0 {pactest => test/pacman}/tests/sync150.py | 0 {pactest => test/pacman}/tests/sync200.py.in | 0 {pactest => test/pacman}/tests/sync300.py | 0 {pactest => test/pacman}/tests/sync301.py | 0 {pactest => test/pacman}/tests/sync400.py | 0 {pactest => test/pacman}/tests/sync401.py | 0 {pactest => test/pacman}/tests/sync402.py | 0 {pactest => test/pacman}/tests/sync403.py | 0 {pactest => test/pacman}/tests/sync404.py | 0 {pactest => test/pacman}/tests/sync405.py | 0 {pactest => test/pacman}/tests/sync406.py | 0 {pactest => test/pacman}/tests/sync500.py | 0 {pactest => test/pacman}/tests/sync501.py | 0 {pactest => test/pacman}/tests/sync890.py | 0 {pactest => test/pacman}/tests/sync891.py | 0 {pactest => test/pacman}/tests/sync892.py | 0 {pactest => test/pacman}/tests/sync893.py | 0 {pactest => test/pacman}/tests/sync895.py | 0 {pactest => test/pacman}/tests/sync896.py | 0 {pactest => test/pacman}/tests/sync897.py | 0 {pactest => test/pacman}/tests/sync898.py | 0 {pactest => test/pacman}/tests/sync899.py | 0 {pactest => test/pacman}/tests/sync900.py | 0 {pactest => test/pacman}/tests/sync901.py | 0 {pactest => test/pacman}/tests/sync990.py | 0 {pactest => test/pacman}/tests/sync992.py | 0 {pactest => test/pacman}/tests/sync993.py | 0 {pactest => test/pacman}/tests/sync999.py | 0 {pactest => test/pacman}/tests/trans001.py | 0 {pactest => test/pacman}/tests/type001.py | 0 {pactest => test/pacman}/tests/unresolvable001.py | 0 {pactest => test/pacman}/tests/upgrade001.py | 0 {pactest => test/pacman}/tests/upgrade002.py | 0 {pactest => test/pacman}/tests/upgrade003.py | 0 {pactest => test/pacman}/tests/upgrade004.py | 0 {pactest => test/pacman}/tests/upgrade005.py | 0 {pactest => test/pacman}/tests/upgrade010.py | 0 {pactest => test/pacman}/tests/upgrade011.py | 0 {pactest => test/pacman}/tests/upgrade012.py | 0 {pactest => test/pacman}/tests/upgrade013.py | 0 {pactest => test/pacman}/tests/upgrade014.py | 0 {pactest => test/pacman}/tests/upgrade015.py | 0 {pactest => test/pacman}/tests/upgrade016.py | 0 {pactest => test/pacman}/tests/upgrade020.py | 0 {pactest => test/pacman}/tests/upgrade021.py | 0 {pactest => test/pacman}/tests/upgrade022.py | 0 {pactest => test/pacman}/tests/upgrade023.py | 0 {pactest => test/pacman}/tests/upgrade024.py | 0 {pactest => test/pacman}/tests/upgrade025.py | 0 {pactest => test/pacman}/tests/upgrade026.py | 0 {pactest => test/pacman}/tests/upgrade030.py | 0 {pactest => test/pacman}/tests/upgrade031.py | 0 {pactest => test/pacman}/tests/upgrade032.py | 0 {pactest => test/pacman}/tests/upgrade040.py | 0 {pactest => test/pacman}/tests/upgrade041.py | 0 {pactest => test/pacman}/tests/upgrade042.py | 0 {pactest => test/pacman}/tests/upgrade043.py | 0 {pactest => test/pacman}/tests/upgrade045.py | 0 {pactest => test/pacman}/tests/upgrade046.py | 0 {pactest => test/pacman}/tests/upgrade050.py | 0 {pactest => test/pacman}/tests/upgrade051.py | 0 {pactest => test/pacman}/tests/upgrade052.py | 0 {pactest => test/pacman}/tests/upgrade053.py | 0 {pactest => test/pacman}/tests/upgrade054.py | 0 {pactest => test/pacman}/tests/upgrade055.py | 0 {pactest => test/pacman}/tests/upgrade056.py | 0 {pactest => test/pacman}/tests/upgrade057.py | 0 {pactest => test/pacman}/tests/upgrade058.py | 0 {pactest => test/pacman}/tests/upgrade059.py | 0 {pactest => test/pacman}/tests/upgrade060.py | 0 {pactest => test/pacman}/tests/upgrade061.py | 0 {pactest => test/pacman}/tests/upgrade070.py | 0 {pactest => test/pacman}/tests/upgrade071.py | 0 {pactest => test/pacman}/tests/upgrade072.py | 0 {pactest => test/pacman}/tests/upgrade073.py | 0 {pactest => test/pacman}/tests/upgrade074.py | 0 {pactest => test/pacman}/tests/upgrade075.py | 0 {pactest => test/pacman}/tests/upgrade076.py | 0 {pactest => test/pacman}/tests/upgrade080.py | 0 {pactest => test/pacman}/tests/upgrade081.py | 0 {pactest => test/pacman}/tests/upgrade082.py | 0 {pactest => test/pacman}/tests/upgrade083.py | 0 {pactest => test/pacman}/tests/upgrade084.py | 0 {pactest => test/pacman}/tests/upgrade090.py | 0 {pactest => test/pacman}/tests/xfercommand001.py | 0 {pactest => test/pacman}/util.py | 0 test/util/Makefile.am | 9 +++++++++ {pactest => test/util}/vercmptest.sh | 0 219 files changed, 22 insertions(+), 14 deletions(-) rename {pactest => test/pacman}/.gitignore (100%) rename {pactest => test/pacman}/ChangeLog (100%) rename {pactest => test/pacman}/Makefile.am (90%) rename {pactest => test/pacman}/README (100%) rename {pactest => test/pacman}/TODO (100%) rename {pactest => test/pacman}/pactest.py (100%) rename {pactest => test/pacman}/pmdb.py (100%) rename {pactest => test/pacman}/pmenv.py (100%) rename {pactest => test/pacman}/pmfile.py (100%) rename {pactest => test/pacman}/pmpkg.py (100%) rename {pactest => test/pacman}/pmrule.py (100%) rename {pactest => test/pacman}/pmtest.py (100%) rename {pactest => test/pacman}/tests/.gitignore (100%) rename {pactest => test/pacman}/tests/Makefile.am (100%) rename {pactest => test/pacman}/tests/config001.py (100%) rename {pactest => test/pacman}/tests/config002.py (100%) rename {pactest => test/pacman}/tests/database001.py (100%) rename {pactest => test/pacman}/tests/database002.py (100%) rename {pactest => test/pacman}/tests/database010.py (100%) rename {pactest => test/pacman}/tests/database011.py (100%) rename {pactest => test/pacman}/tests/database012.py (100%) rename {pactest => test/pacman}/tests/depconflict100.py (100%) rename {pactest => test/pacman}/tests/depconflict110.py (100%) rename {pactest => test/pacman}/tests/depconflict111.py (100%) rename {pactest => test/pacman}/tests/depconflict120.py (100%) rename {pactest => test/pacman}/tests/deptest001.py (100%) rename {pactest => test/pacman}/tests/dummy001.py (100%) rename {pactest => test/pacman}/tests/fileconflict001.py (100%) rename {pactest => test/pacman}/tests/fileconflict002.py (100%) rename {pactest => test/pacman}/tests/fileconflict003.py (100%) rename {pactest => test/pacman}/tests/fileconflict004.py (100%) rename {pactest => test/pacman}/tests/fileconflict005.py (100%) rename {pactest => test/pacman}/tests/fileconflict006.py (100%) rename {pactest => test/pacman}/tests/fileconflict007.py (100%) rename {pactest => test/pacman}/tests/ignore001.py (100%) rename {pactest => test/pacman}/tests/ignore002.py (100%) rename {pactest => test/pacman}/tests/ignore003.py (100%) rename {pactest => test/pacman}/tests/ignore004.py (100%) rename {pactest => test/pacman}/tests/ignore005.py (100%) rename {pactest => test/pacman}/tests/ldconfig001.py (100%) rename {pactest => test/pacman}/tests/ldconfig002.py (100%) rename {pactest => test/pacman}/tests/ldconfig003.py (100%) rename {pactest => test/pacman}/tests/mode001.py (100%) rename {pactest => test/pacman}/tests/mode002.py (100%) rename {pactest => test/pacman}/tests/mode003.py (100%) rename {pactest => test/pacman}/tests/pacman001.py (100%) rename {pactest => test/pacman}/tests/pacman002.py (100%) rename {pactest => test/pacman}/tests/pacman003.py (100%) rename {pactest => test/pacman}/tests/pacman004.py (100%) rename {pactest => test/pacman}/tests/provision001.py (100%) rename {pactest => test/pacman}/tests/provision010.py (100%) rename {pactest => test/pacman}/tests/provision011.py (100%) rename {pactest => test/pacman}/tests/provision012.py (100%) rename {pactest => test/pacman}/tests/provision020.py (100%) rename {pactest => test/pacman}/tests/provision021.py (100%) rename {pactest => test/pacman}/tests/provision022.py (100%) rename {pactest => test/pacman}/tests/query001.py (100%) rename {pactest => test/pacman}/tests/query002.py (100%) rename {pactest => test/pacman}/tests/query003.py (100%) rename {pactest => test/pacman}/tests/query004.py (100%) rename {pactest => test/pacman}/tests/query005.py (100%) rename {pactest => test/pacman}/tests/reason001.py (100%) rename {pactest => test/pacman}/tests/remove001.py (83%) rename {pactest => test/pacman}/tests/remove010.py (100%) rename {pactest => test/pacman}/tests/remove011.py (100%) rename {pactest => test/pacman}/tests/remove020.py (100%) rename {pactest => test/pacman}/tests/remove021.py (100%) rename {pactest => test/pacman}/tests/remove030.py (100%) rename {pactest => test/pacman}/tests/remove040.py (100%) rename {pactest => test/pacman}/tests/remove041.py (100%) rename {pactest => test/pacman}/tests/remove042.py (100%) rename {pactest => test/pacman}/tests/remove043.py (100%) rename {pactest => test/pacman}/tests/remove044.py (100%) rename {pactest => test/pacman}/tests/remove045.py (100%) rename {pactest => test/pacman}/tests/remove047.py (100%) rename {pactest => test/pacman}/tests/remove049.py (100%) rename {pactest => test/pacman}/tests/remove050.py (100%) rename {pactest => test/pacman}/tests/remove051.py (100%) rename {pactest => test/pacman}/tests/remove052.py (100%) rename {pactest => test/pacman}/tests/remove060.py (100%) rename {pactest => test/pacman}/tests/scriptlet001.py (100%) rename {pactest => test/pacman}/tests/scriptlet002.py (100%) rename {pactest => test/pacman}/tests/smoke001.py (100%) rename {pactest => test/pacman}/tests/symlink001.py (100%) rename {pactest => test/pacman}/tests/sync001.py (100%) rename {pactest => test/pacman}/tests/sync002.py (100%) rename {pactest => test/pacman}/tests/sync003.py (100%) rename {pactest => test/pacman}/tests/sync009.py (100%) rename {pactest => test/pacman}/tests/sync010.py (100%) rename {pactest => test/pacman}/tests/sync011.py (100%) rename {pactest => test/pacman}/tests/sync012.py (100%) rename {pactest => test/pacman}/tests/sync020.py (100%) rename {pactest => test/pacman}/tests/sync021.py (100%) rename {pactest => test/pacman}/tests/sync030.py (100%) rename {pactest => test/pacman}/tests/sync031.py (100%) rename {pactest => test/pacman}/tests/sync040.py (100%) rename {pactest => test/pacman}/tests/sync041.py (100%) rename {pactest => test/pacman}/tests/sync042.py (100%) rename {pactest => test/pacman}/tests/sync043.py (100%) rename {pactest => test/pacman}/tests/sync044.py (100%) rename {pactest => test/pacman}/tests/sync045.py (100%) rename {pactest => test/pacman}/tests/sync050.py (100%) rename {pactest => test/pacman}/tests/sync100.py (100%) rename {pactest => test/pacman}/tests/sync1000.py (100%) rename {pactest => test/pacman}/tests/sync1003.py (100%) rename {pactest => test/pacman}/tests/sync1004.py (100%) rename {pactest => test/pacman}/tests/sync1008.py (100%) rename {pactest => test/pacman}/tests/sync101.py (100%) rename {pactest => test/pacman}/tests/sync102.py (100%) rename {pactest => test/pacman}/tests/sync103.py (100%) rename {pactest => test/pacman}/tests/sync104.py (100%) rename {pactest => test/pacman}/tests/sync110.py (100%) rename {pactest => test/pacman}/tests/sync1100.py (100%) rename {pactest => test/pacman}/tests/sync1101.py (100%) rename {pactest => test/pacman}/tests/sync1102.py (100%) rename {pactest => test/pacman}/tests/sync1103.py (100%) rename {pactest => test/pacman}/tests/sync120.py (100%) rename {pactest => test/pacman}/tests/sync130.py (100%) rename {pactest => test/pacman}/tests/sync131.py (100%) rename {pactest => test/pacman}/tests/sync132.py (100%) rename {pactest => test/pacman}/tests/sync133.py (100%) rename {pactest => test/pacman}/tests/sync134.py (100%) rename {pactest => test/pacman}/tests/sync135.py (100%) rename {pactest => test/pacman}/tests/sync136.py (100%) rename {pactest => test/pacman}/tests/sync137.py (100%) rename {pactest => test/pacman}/tests/sync138.py (100%) rename {pactest => test/pacman}/tests/sync150.py (100%) rename {pactest => test/pacman}/tests/sync200.py.in (100%) rename {pactest => test/pacman}/tests/sync300.py (100%) rename {pactest => test/pacman}/tests/sync301.py (100%) rename {pactest => test/pacman}/tests/sync400.py (100%) rename {pactest => test/pacman}/tests/sync401.py (100%) rename {pactest => test/pacman}/tests/sync402.py (100%) rename {pactest => test/pacman}/tests/sync403.py (100%) rename {pactest => test/pacman}/tests/sync404.py (100%) rename {pactest => test/pacman}/tests/sync405.py (100%) rename {pactest => test/pacman}/tests/sync406.py (100%) rename {pactest => test/pacman}/tests/sync500.py (100%) rename {pactest => test/pacman}/tests/sync501.py (100%) rename {pactest => test/pacman}/tests/sync890.py (100%) rename {pactest => test/pacman}/tests/sync891.py (100%) rename {pactest => test/pacman}/tests/sync892.py (100%) rename {pactest => test/pacman}/tests/sync893.py (100%) rename {pactest => test/pacman}/tests/sync895.py (100%) rename {pactest => test/pacman}/tests/sync896.py (100%) rename {pactest => test/pacman}/tests/sync897.py (100%) rename {pactest => test/pacman}/tests/sync898.py (100%) rename {pactest => test/pacman}/tests/sync899.py (100%) rename {pactest => test/pacman}/tests/sync900.py (100%) rename {pactest => test/pacman}/tests/sync901.py (100%) rename {pactest => test/pacman}/tests/sync990.py (100%) rename {pactest => test/pacman}/tests/sync992.py (100%) rename {pactest => test/pacman}/tests/sync993.py (100%) rename {pactest => test/pacman}/tests/sync999.py (100%) rename {pactest => test/pacman}/tests/trans001.py (100%) rename {pactest => test/pacman}/tests/type001.py (100%) rename {pactest => test/pacman}/tests/unresolvable001.py (100%) rename {pactest => test/pacman}/tests/upgrade001.py (100%) rename {pactest => test/pacman}/tests/upgrade002.py (100%) rename {pactest => test/pacman}/tests/upgrade003.py (100%) rename {pactest => test/pacman}/tests/upgrade004.py (100%) rename {pactest => test/pacman}/tests/upgrade005.py (100%) rename {pactest => test/pacman}/tests/upgrade010.py (100%) rename {pactest => test/pacman}/tests/upgrade011.py (100%) rename {pactest => test/pacman}/tests/upgrade012.py (100%) rename {pactest => test/pacman}/tests/upgrade013.py (100%) rename {pactest => test/pacman}/tests/upgrade014.py (100%) rename {pactest => test/pacman}/tests/upgrade015.py (100%) rename {pactest => test/pacman}/tests/upgrade016.py (100%) rename {pactest => test/pacman}/tests/upgrade020.py (100%) rename {pactest => test/pacman}/tests/upgrade021.py (100%) rename {pactest => test/pacman}/tests/upgrade022.py (100%) rename {pactest => test/pacman}/tests/upgrade023.py (100%) rename {pactest => test/pacman}/tests/upgrade024.py (100%) rename {pactest => test/pacman}/tests/upgrade025.py (100%) rename {pactest => test/pacman}/tests/upgrade026.py (100%) rename {pactest => test/pacman}/tests/upgrade030.py (100%) rename {pactest => test/pacman}/tests/upgrade031.py (100%) rename {pactest => test/pacman}/tests/upgrade032.py (100%) rename {pactest => test/pacman}/tests/upgrade040.py (100%) rename {pactest => test/pacman}/tests/upgrade041.py (100%) rename {pactest => test/pacman}/tests/upgrade042.py (100%) rename {pactest => test/pacman}/tests/upgrade043.py (100%) rename {pactest => test/pacman}/tests/upgrade045.py (100%) rename {pactest => test/pacman}/tests/upgrade046.py (100%) rename {pactest => test/pacman}/tests/upgrade050.py (100%) rename {pactest => test/pacman}/tests/upgrade051.py (100%) rename {pactest => test/pacman}/tests/upgrade052.py (100%) rename {pactest => test/pacman}/tests/upgrade053.py (100%) rename {pactest => test/pacman}/tests/upgrade054.py (100%) rename {pactest => test/pacman}/tests/upgrade055.py (100%) rename {pactest => test/pacman}/tests/upgrade056.py (100%) rename {pactest => test/pacman}/tests/upgrade057.py (100%) rename {pactest => test/pacman}/tests/upgrade058.py (100%) rename {pactest => test/pacman}/tests/upgrade059.py (100%) rename {pactest => test/pacman}/tests/upgrade060.py (100%) rename {pactest => test/pacman}/tests/upgrade061.py (100%) rename {pactest => test/pacman}/tests/upgrade070.py (100%) rename {pactest => test/pacman}/tests/upgrade071.py (100%) rename {pactest => test/pacman}/tests/upgrade072.py (100%) rename {pactest => test/pacman}/tests/upgrade073.py (100%) rename {pactest => test/pacman}/tests/upgrade074.py (100%) rename {pactest => test/pacman}/tests/upgrade075.py (100%) rename {pactest => test/pacman}/tests/upgrade076.py (100%) rename {pactest => test/pacman}/tests/upgrade080.py (100%) rename {pactest => test/pacman}/tests/upgrade081.py (100%) rename {pactest => test/pacman}/tests/upgrade082.py (100%) rename {pactest => test/pacman}/tests/upgrade083.py (100%) rename {pactest => test/pacman}/tests/upgrade084.py (100%) rename {pactest => test/pacman}/tests/upgrade090.py (100%) rename {pactest => test/pacman}/tests/xfercommand001.py (100%) rename {pactest => test/pacman}/util.py (100%) create mode 100644 test/util/Makefile.am rename {pactest => test/util}/vercmptest.sh (100%) hooks/post-receive -- The official pacman repository

1 0

Re: [pacman-dev] [arch-dev] [signoff] openssl 1.0.0a
by Allan McRae 02 Jun '10

02 Jun '10

On 02/06/10 10:43, Pierre Schmitz wrote: > On Wed, 02 Jun 2010 09:12:45 +1000, Allan McRae<allan(a)archlinux.org> > wrote: >> vercmp and pacman include the same source file for comparisons so should > >> be fine. >> >> There might have been a change a while back (3.2 I think) when there >> were heaps of discussions about version numbers and how they are sorted. > >> At the moment the scheme is the same as what rpm uses (except rpm has >> epochs to deal with cases like this). >> >> Allan > > Btw: is this a bug in vercmp? > > [pierre@opteron ~]$ vercmp 1.0.0a 1.0.0.a > 0 > [pierre@opteron ~]$ vercmp 1.0.0 1.0.0.a > -1 > [pierre@opteron ~]$ vercmp 1.0.0 1.0.0a > 1 > > If both versions are equal why aren't they if compared with others? > Certainly looks like a bug to me. Forwarding to pacman-dev Allan

1 0

[pacman-dev] [PATCH] Fix typo in pactest
by Allan McRae 30 May '10

30 May '10

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- pactest/tests/remove001.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pactest/tests/remove001.py b/pactest/tests/remove001.py index d20dd07..02d00a4 100644 --- a/pactest/tests/remove001.py +++ b/pactest/tests/remove001.py @@ -6,4 +6,4 @@ self.args = "-R " + "foo "*5 self.addrule("PACMAN_RETCODE=1") -self.addrule("PKG_EXISTS=foo") +self.addrule("PKG_EXIST=foo") -- 1.7.1

2 2

[pacman-dev] [PATCH] [makepkg] use double brackets
by Andres P 29 May '10

29 May '10

Signed-off-by: Andres P <aepd87(a)gmail.com> --- scripts/makepkg.sh.in | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 1707245..be076a7 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -345,7 +345,7 @@ download_file() { run_pacman() { local ret=0 if (( ! ASROOT )) && [[ $1 != "-T" && $1 != "-Qq" ]]; then - if [ "$(type -p sudo)" ] && sudo -l $PACMAN &>/dev/null; then + if [[ $(type -p sudo) ]] && sudo -l $PACMAN &>/dev/null; then sudo $PACMAN $PACMAN_OPTS "$@" || ret=$? else su -c "$PACMAN $PACMAN_OPTS $*" || ret=$? @@ -519,7 +519,7 @@ generate_checksums() { msg "$(gettext "Generating checksums for source files...")" plain "" - if [ ! $(type -p openssl) ]; then + if [[ ! $(type -p openssl) ]]; then error "$(gettext "Cannot find openssl.")" exit 1 # $E_MISSING_PROGRAM fi @@ -580,7 +580,7 @@ generate_checksums() { check_checksums() { (( ! ${#source[@]} )) && return 0 - if [ ! $(type -p openssl) ]; then + if [[ ! $(type -p openssl) ]]; then error "$(gettext "Cannot find openssl.")" exit 1 # $E_MISSING_PROGRAM fi @@ -1296,7 +1296,7 @@ check_sanity() { if (( ${#pkgname[@]} > 1 )); then for pkg in ${pkgname[@]}; do - if [ "$(type -t package_${pkg})" != "function" ]; then + if [[ $(type -t package_${pkg}) != "function" ]]; then error "$(gettext "missing package function for split package '%s'")" "$pkg" return 1 fi @@ -1333,27 +1333,27 @@ devel_check() { # Also do a brief check to make sure we have the VCS tool available. oldpkgver=$pkgver if [[ -n ${_darcstrunk} && -n ${_darcsmod} ]] ; then - [ $(type -p darcs) ] || return 0 + [[ $(type -p darcs) ]] || return 0 msg "$(gettext "Determining latest darcs revision...")" newpkgver=$(date +%Y%m%d) elif [[ -n ${_cvsroot} && -n ${_cvsmod} ]] ; then - [ $(type -p cvs) ] || return 0 + [[ $(type -p cvs) ]] || return 0 msg "$(gettext "Determining latest cvs revision...")" newpkgver=$(date +%Y%m%d) elif [[ -n ${_gitroot} && -n ${_gitname} ]] ; then - [ $(type -p git) ] || return 0 + [[ $(type -p git) ]] || return 0 msg "$(gettext "Determining latest git revision...")" newpkgver=$(date +%Y%m%d) elif [[ -n ${_svntrunk} && -n ${_svnmod} ]] ; then - [ $(type -p svn) ] || return 0 + [[ $(type -p svn) ]] || return 0 msg "$(gettext "Determining latest svn revision...")" newpkgver=$(LC_ALL=C svn info $_svntrunk | sed -n 's/^Last Changed Rev: $[0-9]*$$/\1/p') elif [[ -n ${_bzrtrunk} && -n ${_bzrmod} ]] ; then - [ $(type -p bzr) ] || return 0 + [[ $(type -p bzr) ]] || return 0 msg "$(gettext "Determining latest bzr revision...")" newpkgver=$(bzr revno ${_bzrtrunk}) elif [[ -n ${_hgroot} && -n ${_hgrepo} ]] ; then - [ $(type -p hg) ] || return 0 + [[ $(type -p hg) ]] || return 0 msg "$(gettext "Determining latest hg revision...")" if [[ -d ./src/$_hgrepo ]] ; then cd ./src/$_hgrepo @@ -1555,7 +1555,7 @@ There is NO WARRANTY, to the extent permitted by law.\n")" # PROGRAM START # determine whether we have gettext; make it a no-op if we do not -if [ ! $(type -t gettext) ]; then +if [[ ! $(type -t gettext) ]]; then gettext() { echo "$@" } @@ -1729,7 +1729,7 @@ if (( ! INFAKEROOT )); then plain "$(gettext "Please rerun makepkg without the --asroot flag.")" exit 1 # $E_USER_ABORT elif [[ $(check_buildenv fakeroot) = "y" ]] && (( EUID > 0 )); then - if [ ! $(type -p fakeroot) ]; then + if [[ ! $(type -p fakeroot) ]]; then error "$(gettext "Fakeroot must be installed if using the 'fakeroot' option")" plain "$(gettext "in the BUILDENV array in %s.")" "$MAKEPKG_CONF" exit 1 @@ -1749,7 +1749,7 @@ fi # check for sudo if we will need it during makepkg execution if (( ! ( ASROOT || INFAKEROOT ) && ( DEP_BIN || RMDEPS || INSTALL ) )); then - if [ ! "$(type -p sudo)" ]; then + if [[ ! $(type -p sudo) ]]; then warning "$(gettext "Sudo can not be found. Will use su to acquire root privileges.")" fi fi @@ -1810,9 +1810,9 @@ fi if [[ $(! type -t build) = "function" ]]; then BUILDFUNC=1 fi -if [ "$(type -t package)" = "function" ]; then +if [[ $(type -t package) = "function" ]]; then PKGFUNC=1 -elif [ $SPLITPKG -eq 0 -a "$(type -t package_${pkgname})" = "function" ]; then +elif [[ $SPLITPKG -eq 0 && $(type -t package_${pkgname}) = "function" ]]; then SPLITPKG=1 fi @@ -1921,7 +1921,7 @@ if (( NODEPS || ( (NOBUILD || REPKG) && !DEP_BIN ) )); then if (( NODEPS || ( REPKG && PKGFUNC ) )); then warning "$(gettext "Skipping dependency checks.")" fi -elif [ $(type -p "${PACMAN%% *}") ]; then +elif [[ $(type -p "${PACMAN%% *}") ]]; then if (( RMDEPS )); then original_pkglist=($(run_pacman -Qq | sort)) # required by remove_dep fi -- 1.7.1

6 24

[pacman-dev] [PATCH] Remove unnecessary error catching from PKGBUILD protos
by Allan McRae 29 May '10

29 May '10

The use of "|| return 1" is no longer necessary in PKGBUILDs. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- PKGBUILD-split.proto | 2 +- PKGBUILD.proto | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PKGBUILD-split.proto b/PKGBUILD-split.proto index 484cb1a..d7f1de1 100644 --- a/PKGBUILD-split.proto +++ b/PKGBUILD-split.proto @@ -29,7 +29,7 @@ md5sums=() #generate with 'makepkg -g' build() { cd "$srcdir/$pkgbase-$pkgver" ./configure --prefix=/usr - make || return 1 + make } package_pkg1() { diff --git a/PKGBUILD.proto b/PKGBUILD.proto index b4d9c94..ebbdf0a 100644 --- a/PKGBUILD.proto +++ b/PKGBUILD.proto @@ -30,7 +30,7 @@ build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr - make || return 1 + make } package() { -- 1.7.1

1 0