- Pacman-dev - lists.archlinux.org

[pacman-dev] CVS update of pacman-lib/lib/libalpm (package.c package.h)
by Aaron Griffin 06 Feb '07

06 Feb '07

Date: Tuesday, February 6, 2007 @ 15:57:17 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: package.c (1.59 -> 1.60) package.h (1.25 -> 1.26) Attempt #2 at -S/-Su unification: verify that the 'force' option has been read before comparing versions -----------+ package.c | 5 +++++ package.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.59 pacman-lib/lib/libalpm/package.c:1.60 --- pacman-lib/lib/libalpm/package.c:1.59 Tue Feb 6 12:41:36 2007 +++ pacman-lib/lib/libalpm/package.c Tue Feb 6 15:57:17 2007 @@ -125,6 +125,11 @@ /* Is pkgB an upgrade for pkgA ? */ int alpm_pkg_compare_versions(pmpkg_t *pkgA, pmpkg_t *pkgB) { + if(spkg->origin == PKG_FROM_CACHE) { + /* ensure we have the /desc file, which contains the 'force' option */ + _alpm_db_read(pkgB->data, INFRQ_DESC, pkgB); + } + if(pkgB->force) { /* skip the version compare call if this is a 'force' package */ return(1); Index: pacman-lib/lib/libalpm/package.h diff -u pacman-lib/lib/libalpm/package.h:1.25 pacman-lib/lib/libalpm/package.h:1.26 --- pacman-lib/lib/libalpm/package.h:1.25 Sun Feb 4 03:26:52 2007 +++ pacman-lib/lib/libalpm/package.h Tue Feb 6 15:57:17 2007 @@ -82,7 +82,7 @@ alpm_list_t *conflicts; alpm_list_t *provides; /* internal */ - unsigned short origin; + pmpkgfrom_t origin; void *data; pmdbinfrq_t infolevel; };

1 0

[pacman-dev] CVS update of pacman-lib/doc (po4a.cfg)
by dan＠archlinux.org 06 Feb '07

06 Feb '07

Date: Tuesday, February 6, 2007 @ 15:34:32 Author: dan Path: /home/cvs-pacman/pacman-lib/doc Modified: po4a.cfg (1.2 -> 1.3) one more change for man page move ----------+ po4a.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: pacman-lib/doc/po4a.cfg diff -u pacman-lib/doc/po4a.cfg:1.2 pacman-lib/doc/po4a.cfg:1.3 --- pacman-lib/doc/po4a.cfg:1.2 Mon Jan 29 17:18:31 2007 +++ pacman-lib/doc/po4a.cfg Tue Feb 6 15:34:32 2007 @@ -6,6 +6,6 @@ [type: man] makepkg.8 \ $lang:$lang/makepkg.8 add_$(srcdir)/$lang:addendum.8.$lang \ opt:"-o groff_code=verbatim -o translate_joined=CW,CE -o no_wrap=CW:CE" -[type: man] $(srcdir)/PKGBUILD.8 \ - $lang:$lang/PKGBUILD.8 add_$(srcdir)/$lang:addendum.8.$lang \ +[type: man] $(srcdir)/PKGBUILD.5 \ + $lang:$lang/PKGBUILD.5 add_$(srcdir)/$lang:addendum.8.$lang \ opt:"-o groff_code=verbatim -o translate_joined=CW,CE -o no_wrap=CW:CE"

1 0

[pacman-dev] CVS update of pacman-lib/doc (Makefile.am hu/Makefile.am)
by dan＠archlinux.org 06 Feb '07

06 Feb '07

Date: Tuesday, February 6, 2007 @ 15:23:41 Author: dan Path: /home/cvs-pacman/pacman-lib/doc Modified: Makefile.am (1.10 -> 1.11) hu/Makefile.am (1.2 -> 1.3) fix makefiles for PKGBUILD.8 -> PKGBUILD.5 ----------------+ Makefile.am | 8 ++++---- hu/Makefile.am | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) Index: pacman-lib/doc/Makefile.am diff -u pacman-lib/doc/Makefile.am:1.10 pacman-lib/doc/Makefile.am:1.11 --- pacman-lib/doc/Makefile.am:1.10 Mon Jan 29 17:18:31 2007 +++ pacman-lib/doc/Makefile.am Tue Feb 6 15:23:41 2007 @@ -1,4 +1,4 @@ -all: po4a makepkg.8 PKGBUILD.8 pacman.8 +all: po4a makepkg.8 PKGBUILD.5 pacman.8 SUBDIRS = hu @@ -13,8 +13,8 @@ makepkg.8: man2html makepkg.8 > html/makepkg.8.html -PKGBUILD.8: - man2html PKGBUILD.8 > html/PKGBUILD.8.html +PKGBUILD.5: + man2html PKGBUILD.5 > html/PKGBUILD.5.html pacman.8: man2html pacman.8 > html/pacman.8.html @@ -25,7 +25,7 @@ rm -f hu/*.8 rm -f man3/*.3 -man_MANS = pacman.8 makepkg.8 PKGBUILD.8 libalpm.3 +man_MANS = pacman.8 makepkg.8 PKGBUILD.5 libalpm.3 if HAS_DOXYGEN man_MANS += *.3 Index: pacman-lib/doc/hu/Makefile.am diff -u pacman-lib/doc/hu/Makefile.am:1.2 pacman-lib/doc/hu/Makefile.am:1.3 --- pacman-lib/doc/hu/Makefile.am:1.2 Tue Nov 14 02:58:42 2006 +++ pacman-lib/doc/hu/Makefile.am Tue Feb 6 15:23:41 2007 @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS=foreign mandir = @mandir@/hu -man_MANS = pacman.8 makepkg.8 PKGBUILD.8 +man_MANS = pacman.8 makepkg.8 PKGBUILD.5 $(man_MANS): -EXTRA_DIST = pacman.8 makepkg.8 PKGBUILD.8 +EXTRA_DIST = pacman.8 makepkg.8 PKGBUILD.5

1 0

[pacman-dev] CVS update of pacman-lib/doc (PKGBUILD.5)
by Aaron Griffin 06 Feb '07

06 Feb '07

Date: Tuesday, February 6, 2007 @ 13:45:32 Author: aaron Path: /home/cvs-pacman/pacman-lib/doc Modified: PKGBUILD.5 (1.1 -> 1.2) Minor fixups for the moment, still partially complete ------------+ PKGBUILD.5 | 141 ++++++++++++++++++++++++++++------------------------------- 1 file changed, 68 insertions(+), 73 deletions(-) Index: pacman-lib/doc/PKGBUILD.5 diff -u pacman-lib/doc/PKGBUILD.5:1.1 pacman-lib/doc/PKGBUILD.5:1.2 --- pacman-lib/doc/PKGBUILD.5:1.1 Tue Feb 6 13:33:35 2007 +++ pacman-lib/doc/PKGBUILD.5 Tue Feb 6 13:45:32 2007 @@ -54,47 +54,6 @@ required to build. If some are missing it will attempt to download them, provided there is a fully-qualified URL in the \fIsource()\fR array. -.SS Install/Upgrade/Remove Scripting -Pacman has the ability to store and execute a package-specific script when it -installs, removes, or upgrades a package. This allows a package to "configure -itself" after installation and do the opposite right before it is removed. - -The exact time the script is run varies with each operation: - -.TP -.B pre_install -script is run right before files are extracted. - -.TP -.B post_install -script is run right after files are extracted. - -.TP -.B pre_upgrade -script is run right before files are extracted. - -.TP -.B post_upgrade -script is run after files are extracted. - -.TP -.B pre_remove -script is run right before files are removed. - -.TP -.B post_remove -script is run right after files are removed. - -.P -To use this feature, just create a file (eg, pkgname.install) and put it in -the same directory as the PKGBUILD script. Then use the \fIinstall\fR -directive: - -install=pkgname.install - -The install script does not need to be specified in the \fIsource\fR array. -A template install file is available in your ABS tree (/var/abs/install.proto). - .SH OPTIONS AND DIRECTIVES .TP .B pkgname @@ -114,11 +73,12 @@ .B pkgdesc This should be a brief description of the package and its functionality. -." Is this applicable below? -.TP -.B pkgdesc_localized \fI(array)\fR -Array of the localized package descriptions. The format is the following: -pkgdesc_localized=('xx_YY foo' 'xx_YY bar') +." Not entirely applicable, and we can do this better anyway. pacman does +." actuall support localized descriptions, though, but i don't think makepkg does. +." .TP +." .B pkgdesc_localized \fI(array)\fR +." Array of the localized package descriptions. The format is the following: +." pkgdesc_localized=('xx_YY foo' 'xx_YY bar') .TP .B url @@ -130,9 +90,9 @@ This field specifies the license(s) that apply to the package. Commonly-used licenses are typically found in \fI/usr/share/licenses/common\fR. If you see the package's license there, simply reference it in the license field -(eg, \fBlicense="GPL"\fR). If the package provides a license not found in +(eg, \fBlicense=("GPL")\fR). If the package provides a license not found in \fI/usr/share/licenses/common\fR, then you should include the license in -the package itself and set \fBlicense="custom"\fR or +the package itself and set \fBlicense=("custom")\fR or \fBlicense="custom:LicenseName"\fR. The license itself should be placed in a directory called \fI$startdir/pkg/usr/share/licenses/$pkgname\fR. If multiple licenses are applied, use the array form: \fBlicenses=('GPL' 'FDL')\fR @@ -144,12 +104,6 @@ copied into the package by makepkg. It does not need to be included in the \fIsource\fR array. (eg, install=pkgname.install) -." Is this applicable below? -.TP -.B up2date -This directive should contain a command that prints the current upstream stable -version of the project. - .TP .B source \fI(array)\fR The \fIsource\fR line is an array of source files required to build the @@ -157,6 +111,13 @@ file, unless they have a fully-qualified URL. .TP +.B noextract \fI(array)\fR +The \fInoextract\fR line is an array of filenames corresponding to those from +the \fIsource\fR array. If a file is listed in the \fInoextract\fR array, it is +not extracted with the rest of the source files. This is useful for packages +which use compressed data which id downloaded via the \fIsource\fR array. + +.TP .B md5sums \fI(array)\fR If this field is present, it should contain an MD5 hash for every source file specified in the \fIsource\fR array (in the same order). \fImakepkg\fR will use @@ -164,15 +125,9 @@ generate md5sums, first build using the PKGBUILD then run \fBmakepkg -g >>PKGBUILD\fR. Then you can edit the PKGBUILD and move the \fImd5sums\fR line from the bottom to an appropriate location. - -." Is this applicable below? -.TP -.B signatures \fI(array)\fR -If this field is present, it should contain an array of gpg signatures required -to validate the source files. Where there is no signature available just leave -it empty, like: - -signatures=(${source[0]}.asc '') +\fBNOTE:\fR makepkg supports multiple integrity algorithms and their +corresponding arrays (i.e. sha1sums for the SHA1 algorithm), however official +packages use only md5sums for the time being. .TP .B groups \fI(array)\fR @@ -181,7 +136,7 @@ one could install all KDE packages by installing the 'kde' group. .TP -.B archs \fI(array)\fR +.B arch \fI(array)\fR This array defines on which architectures the given package is available. .TP @@ -231,17 +186,48 @@ This array allows you to override some of makepkg's default behaviour when building packages. To set an option, just include the option name in the \fBoptions\fR array. -.RS +See \fBmakepkg (8)\fR for details on the options array. + +.SS Install/Upgrade/Remove Scripting +Pacman has the ability to store and execute a package-specific script when it +installs, removes, or upgrades a package. This allows a package to "configure +itself" after installation and do the opposite right before it is removed. + +The exact time the script is run varies with each operation: + .TP -.B nostrip -don't strip binaries/libraries. +.B pre_install +script is run right before files are extracted. + .TP -.B keepdocs -keep /usr/share/doc and /usr/share/info directories. +.B post_install +script is run right after files are extracted. + .TP -.B force -force the package to be upgraded by --sysupgrade, even if it's an older version. -.RE +.B pre_upgrade +script is run right before files are extracted. + +.TP +.B post_upgrade +script is run after files are extracted. + +.TP +.B pre_remove +script is run right before files are removed. + +.TP +.B post_remove +script is run right after files are removed. + +.P +To use this feature, just create a file (eg, pkgname.install) and put it in +the same directory as the PKGBUILD script. Then use the \fIinstall\fR +directive: + +install=pkgname.install + +The install script does not need to be specified in the \fIsource\fR array. +A template install file is available in your ABS tree (/var/abs/install.proto). .SH EXAMPLE The following is an example PKGBUILD for the 'modutils' package. For more @@ -249,6 +235,7 @@ .nf # Maintainer: John Doe <johndoe(a)archlinux.org> +# Contributor: Bill Smith <billsmith(a)archlinux.org> pkgname=modutils pkgver=2.4.25 pkgrel=1 @@ -259,8 +246,11 @@ backup=(etc/modules.conf) source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/v2.4/$pkgname-… \\ modules.conf) +arch=('i686') +license=('GPL' 'custom') #dual licensed md5sums=('2c0cca3ef6330a187c6ef4fe41ecaa4d' \\ '35175bee593a7cc7d6205584a94d8625') +options=('nolibtool') build() { cd $startdir/src/$pkgname-$pkgver @@ -275,7 +265,9 @@ .SH SEE ALSO .BR makepkg (8), +.BR makepkg.conf (5), .BR pacman (8) +.BR pacman.conf (5) See the Arch Linux website at <http://www.archlinux.org> for more current information on the distribution, and @@ -283,4 +275,7 @@ recommendations on packaging standards. .SH AUTHORS Judd Vinet <jvinet(a)zeroflux.org> -and the Frugalware developers <frugalware-devel(a)frugalware.org> +Aurelien Foret <aurelien(a)archlinux.org> +Aaron Griffin <aaron(a)archlinux.org> +Dan McGee <dan(a)archlinux.org> +See the 'AUTHORS' file for additional contributors.

1 0

[pacman-dev] CVS update of pacman-lib/doc (PKGBUILD.5 PKGBUILD.8)
by Aaron Griffin 06 Feb '07

06 Feb '07

Date: Tuesday, February 6, 2007 @ 13:33:35 Author: aaron Path: /home/cvs-pacman/pacman-lib/doc Added: PKGBUILD.5 (1.1) Removed: PKGBUILD.8 (1.2) Swapped out PKGBUILD.8 for PKGBUILD.5 from Dan McGee - original PKGBUILD.8 had too many Frugal specific changes. ------------+ PKGBUILD.5 | 286 ++++++++++++++++++++++++++++++++++++ PKGBUILD.8 | 460 ----------------------------------------------------------- 2 files changed, 286 insertions(+), 460 deletions(-) Index: pacman-lib/doc/PKGBUILD.5 diff -u /dev/null pacman-lib/doc/PKGBUILD.5:1.1 --- /dev/null Tue Feb 6 13:33:35 2007 +++ pacman-lib/doc/PKGBUILD.5 Tue Feb 6 13:33:35 2007 @@ -0,0 +1,286 @@ +." the string declarations are a start to try and make distro independent +.ds DS Arch Linux +.ds PB PKGBUILD +.ds VR 3.0.0 +.TH PKGBUILD 5 "Feb 06, 2007" "PKGBUILD version \*(VR" "\*(DS Files" +.SH NAME +PKGBUILD \- \*(DS package build description file +.SH DESCRIPTION +This manual page is meant to describe general rules about PKGBUILDs. Once +a PKGBUILD is written, the actual package is built using \fBmakepkg\fR and +installed with \fBpacman\fR. + +\fBNOTE:\fR If you have a local copy of the Arch Build System (ABS) tree +on your computer, you can copy the PKGBUILD.proto file to your new package +build directory and edit it from there. To acquire/sync the ABS tree, use +the \fBabs\fR script included with pacman/makepkg. + +.SS Quick PKGBUILD Explanation +For an example of a PKGBUILD, see the \fBEXAMPLE\fR section. + +\fIpkgname\fR defines the package name. It should not contain any uppercase +letters. \fIpkgversion\fR defines the actual package version as given by the +developers of the package. No dashes are allowed. \fIpkgrel\fR allows for +\*(DS-specific changes to the package or corrections to a PKGBUILD +without an upstream version change. The value should be an integer. +\fIpkgdesc\fR is a short one-line description for the package, usually taken +from the project's homepage or manpage. It is preferable to keep the length to +one line for displaying during searches. These four variables are required in +every PKGBUILD. \fIurl\fR is also highly recommended so users can find more +information on the package if needed. + +\fIdepends\fR and \fImakedepends\fR are bash arrays which define the +dependencies of the package. Packages listed in \fImakedepends\fR are required +only for building the package, and not for runtime. \fIdepends\fR is used to +list runtime depends. To build the package using \fBmakepkg\fR, ALL dependencies +must be satisfied. For \fBpacman\fR to install the package, all runtime depends +must be satisfied. + +The \fIbackup\fR array specifies files that should be treated specially +when removing or upgrading packages. See \fBHANDLING CONFIG FILES\fR in +the \fIpacman\fR manpage for more information on this. + +The \fIsource()\fR array tells makepkg which files to download or extract before +compiling begins. The \fImd5sums()\fR array provides md5sums for each of these +files. These are used to validate the integrity of the source files. + +The \fIbuild\fR function is what actually does the work of putting the package +together. Sometimes this is as simple as a configure, make, make install (to +$startdir/pkg). However, some customizations are often needed during the build +process. + +Once your PKGBUILD is created, you can run \fBmakepkg\fR from the build +directory. \fBmakepkg\fR will check dependencies and look for the source files +required to build. If some are missing it will attempt to download them, +provided there is a fully-qualified URL in the \fIsource()\fR array. + +.SS Install/Upgrade/Remove Scripting +Pacman has the ability to store and execute a package-specific script when it +installs, removes, or upgrades a package. This allows a package to "configure +itself" after installation and do the opposite right before it is removed. + +The exact time the script is run varies with each operation: + +.TP +.B pre_install +script is run right before files are extracted. + +.TP +.B post_install +script is run right after files are extracted. + +.TP +.B pre_upgrade +script is run right before files are extracted. + +.TP +.B post_upgrade +script is run after files are extracted. + +.TP +.B pre_remove +script is run right before files are removed. + +.TP +.B post_remove +script is run right after files are removed. + +.P +To use this feature, just create a file (eg, pkgname.install) and put it in +the same directory as the PKGBUILD script. Then use the \fIinstall\fR +directive: + +install=pkgname.install + +The install script does not need to be specified in the \fIsource\fR array. +A template install file is available in your ABS tree (/var/abs/install.proto). + +.SH OPTIONS AND DIRECTIVES +.TP +.B pkgname +The name of the package. This has be a unix-friendly name as it will be +used in the package filename. + +.TP +.B pkgver +This is the version of the software as released from the author (eg, 2.7.1). + +.TP +.B pkgrel +This is the release number specific to \*(DS's release. This allows package +maintainers to make updates to the package's configure flags, for example. + +.TP +.B pkgdesc +This should be a brief description of the package and its functionality. + +." Is this applicable below? +.TP +.B pkgdesc_localized \fI(array)\fR +Array of the localized package descriptions. The format is the following: +pkgdesc_localized=('xx_YY foo' 'xx_YY bar') + +.TP +.B url +This field contains an optional URL that is associated with the piece of +software being packaged. This is typically the project's website. + +.TP +.B license \fI(array)\fR +This field specifies the license(s) that apply to the package. Commonly-used +licenses are typically found in \fI/usr/share/licenses/common\fR. If you +see the package's license there, simply reference it in the license field +(eg, \fBlicense="GPL"\fR). If the package provides a license not found in +\fI/usr/share/licenses/common\fR, then you should include the license in +the package itself and set \fBlicense="custom"\fR or +\fBlicense="custom:LicenseName"\fR. The license itself should be placed in a +directory called \fI$startdir/pkg/usr/share/licenses/$pkgname\fR. If multiple +licenses are applied, use the array form: \fBlicenses=('GPL' 'FDL')\fR + +.TP +.B install +Specifies a special install script that is to be included in the package. +This file should reside in the same directory as the PKGBUILD, and will be +copied into the package by makepkg. It does not need to be included in the +\fIsource\fR array. (eg, install=pkgname.install) + +." Is this applicable below? +.TP +.B up2date +This directive should contain a command that prints the current upstream stable +version of the project. + +.TP +.B source \fI(array)\fR +The \fIsource\fR line is an array of source files required to build the +package. Source files must reside in the same directory as the PKGBUILD +file, unless they have a fully-qualified URL. + +.TP +.B md5sums \fI(array)\fR +If this field is present, it should contain an MD5 hash for every source file +specified in the \fIsource\fR array (in the same order). \fImakepkg\fR will use +this to verify source file integrity during subsequent builds. To easily +generate md5sums, first build using the PKGBUILD then run +\fBmakepkg -g >>PKGBUILD\fR. Then you can edit the PKGBUILD and move the +\fImd5sums\fR line from the bottom to an appropriate location. + +." Is this applicable below? +.TP +.B signatures \fI(array)\fR +If this field is present, it should contain an array of gpg signatures required +to validate the source files. Where there is no signature available just leave +it empty, like: + +signatures=(${source[0]}.asc '') + +.TP +.B groups \fI(array)\fR +This is an array of symbolic names that represent groups of packages, allowing +you to install multiple packages by requesting a single target. For example, +one could install all KDE packages by installing the 'kde' group. + +.TP +.B archs \fI(array)\fR +This array defines on which architectures the given package is available. + +.TP +.B backup \fI(array)\fR +A space-delimited array of filenames (without a preceding slash). The +\fIbackup\fR line will be propagated to the package meta-info file for +pacman. This will designate all files listed there to be backed up if this +package is ever removed from a system. See \fBHANDLING CONFIG FILES\fR in +the \fIpacman\fR manpage for more information. + +.TP +.B depends \fI(array)\fR +An array of packages that this package depends on to build and run. Packages +in this list should be surrounded with single quotes and contain at least the +package name. They can also include a version requirement of the form +\fBname<>version\fR, where <> is one of these three comparisons: +\fB>=\fR (greater than equal to), \fB<=\fR (less than or equal to), or +\fB=\fR (equal to). + +.TP +.B makedepends \fI(array)\fR +An array of packages that this package depends on to build, but not at runtime. +Packages in this list should follow the same format as \fIdepends\fR. + +.TP +.B conflicts \fI(array)\fR +An array of packages that will conflict with this package (ie, they cannot both +be installed at the same time). This directive follows the same format as +\fIdepends\fR except you cannot specify versions. + +.TP +.B provides \fI(array)\fR +An array of "virtual provisions" that this package provides. This allows a +package to provide dependencies other than its own package name. For example, +the kernel26beyond package can each provide 'kernel26' which allows packages +to simply depend on 'kernel26' rather than "kernel26 OR kernel26beyond". + +.TP +.B replaces \fI(array)\fR +This is an array of packages that this package should replace, and can be used +to handle renamed/combined packages. For example, if the j2re package gets +renamed to jre, then subsequent 'pacman -Syu' calls will not pick up the +upgrade, due to the differing package names. \fIreplaces\fR handles this. + +.TP +.B options \fI(array)\fR +This array allows you to override some of makepkg's default behaviour +when building packages. To set an option, just include the option name +in the \fBoptions\fR array. +.RS +.TP +.B nostrip +don't strip binaries/libraries. +.TP +.B keepdocs +keep /usr/share/doc and /usr/share/info directories. +.TP +.B force +force the package to be upgraded by --sysupgrade, even if it's an older version. +.RE + +.SH EXAMPLE +The following is an example PKGBUILD for the 'modutils' package. For more +examples, look through the ABS tree. + +.nf +# Maintainer: John Doe <johndoe(a)archlinux.org> +pkgname=modutils +pkgver=2.4.25 +pkgrel=1 +pkgdesc="Utilities for inserting modules in the linux kernel" +url="http://www.kernel.org" +makedepends=('bash' 'mawk') +depends=('glibc' 'zlib') +backup=(etc/modules.conf) +source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/v2.4/$pkgname-$pkgver.tar.bz2 \\ + modules.conf) +md5sums=('2c0cca3ef6330a187c6ef4fe41ecaa4d' \\ + '35175bee593a7cc7d6205584a94d8625') + +build() { + cd $startdir/src/$pkgname-$pkgver + ./configure --prefix=/usr --enable-insmod-static + make || return 1 + make prefix=$startdir/pkg/usr install + mv $startdir/pkg/usr/sbin $startdir/pkg + mkdir -p $startdir/pkg/etc + cp ../modules.conf $startdir/pkg/etc +} +.fi + +.SH SEE ALSO +.BR makepkg (8), +.BR pacman (8) + +See the Arch Linux website at <http://www.archlinux.org> for more current +information on the distribution, and +<http://wiki.archlinux.org/index.php/Arch_Packaging_Standards> for +recommendations on packaging standards. +.SH AUTHORS +Judd Vinet <jvinet(a)zeroflux.org> +and the Frugalware developers <frugalware-devel(a)frugalware.org> Index: pacman-lib/doc/PKGBUILD.8 diff -u pacman-lib/doc/PKGBUILD.8:1.2 pacman-lib/doc/PKGBUILD.8:removed --- pacman-lib/doc/PKGBUILD.8:1.2 Tue Nov 14 02:58:42 2006 +++ pacman-lib/doc/PKGBUILD.8 Tue Feb 6 13:33:35 2007 @@ -1,460 +0,0 @@ -.TH PKGBUILD 8 "June 13, 2006" "Archlinux Developer Manual" "" -.SH NAME -PKGBUILD \- Archlinux package builder descriptor -.SH DESCRIPTION -This manual page is meant to describe general rules about PKGBUILDs. If -you're interested in the package builder \fBmakepkg\fP itself, then see its -manual page, not this one. - -.TP -.TP -.SH PKGBUILD Example: -.RS -.nf -# Last Modified: Sun, 19 Jun 2005 15:24:32 +0000 -# Compiling Time: 0.17 SBU -# Maintainer: Name <email(a)addr.ess> - -pkgname=dvdauthor -pkgver=0.6.11 -pkgrel=3 -pkgdesc="Will generate a DVD movie from a valid mpeg2 stream" -depends=('imagemagick' 'libdvdread') -Finclude sourceforge -groups=('xapps') -archs=('i686' 'x86_64') -sha1sums=('a99ea7ef6e50646b77ad47a015127925053d34ea') - -# optimization OK -.fi -.RE - -As you can see, the setup is fairly simple. The first line tracks the time of -the last update, this is automatically updated after a successful build. - -The next line defines its build time. Of course, it depends on your hardware, -so we use SBUs instead of minutes as a unit. - -SBU is the Static Binutils Unit, which means the time "repoman merge binutils" -takes on your machine. By default makepkg will print out how many seconds the -build took. After you built binutils, you should update your /etc/makepkg.conf: - -SBU="257" - -The line above means compiling binutils on your machine took 257 seconds. -Starting from this point, makepkg will print out SBUs instead of seconds after -successful builds, and this SBU value will be equal on anyone's machine. - -If you wish to maintain the package, write your name or nick and e-mail -address to the third line. If you don't plan to maintain the package just wrote -the PKGBUILD, then write Contributor instead of Maintainer, and then someone -can take it and will add his/her line later. Other lines like "Modified by" are -not allowed. Use the darcs patch comments to mention others if you wish. - -pkgname defines the package name. It should not contain any uppercase letters. -The package version defines the upstream version, while the package release -tracks the Archlinux-specific changes. pkgrel should be an integer, pkgrels -like 5wanda1 are reserved for security updates. There the rule is the -following: If the original package's pkgrel was 4, then increment it once when -you add a security patch, but then use 5wanda1, 5wanda2 and so on. This way -the user can easily upgrade to pkgrel=5 which is in -current. - -pkgdesc is a short one-line description for the package. Usually taken from -the project's homepage or manpage. Try to keep the lenght under 80 chars. - -depends() is a bash array which defines the dependencies of the package. -depends() means the other package is required for building and using the -current one. If the dependency is runtime-only, then use rodepends(), if -buildtime-only then use makedepends(). - -The next line is a special Finclude commands which allows you to inherit -any directive from a PKGBUILD scheme. They can be found in the FST, -under /source/include. The "util" scheme always included, since its -provided functions are used by almost every PKGBUILD. Look at the -/source/include/sourceforge.sh, it provides the url, up2date and source() -directives, so we don't have to specify them here. After the Finclude you -can overwrite the inherited directives, for example define a custom up2date -if the inherited one is not sutable for you. - -The groups() array's first element can't be omitted, and it should be a valid -"first group". This means it should be in a foo or foo-extra format, where foo -or foo-extra is a dir under /source in the FST. - -The archs() array defines for which architectures the given package is -available. If it's not available, it means that gensync will skip it when -generating package databases. If you are not able to provide a binary package -for a given arch, don't include that in archs()! For example, no matter if -the package could be compiled in x86_64, if you haven't compiled it yourself, -don't include it. If you're sure it won't be available on a given arch (for -example it's written in x86 asm), then use !arch, for example !x86_64. - -The sha1sums() array can be generated with the makepkg -g command. Its purpose -is to prevent compiling from wrong sources, especially when the build is -automatic. Where it is available you can use signatures(), its goal is that -you don't have to update it manually every time. - -The last line will be added automatically to the end of the PKGBUILD if the -build() function used your $CFLAGS or $CXXFLAGS. This is handy if you want to -cross-compile on a faster machine for a slower architecture. Until the package -doesn't use our $CFLAGS we can't cross-compile it, so please try to avoid -creating "unoptimized" packages. If the package doesn't contain any -architecture-dependent file, then you can add this line manually as makepkg -will not detect this. - -Finally we define a build() function that will build the package. If you don't -want to do anything special, probably you don't have to specify anything, as -the default build() (inherited from util.sh) will fit your needs. Even if you -define a custom build(), probably you can re-use parts of the default build(). -For the list of special functions provided by util.sh and others refer to -the /source/include dir. Again, util.sh is included automatically, but you -have to Finclude the others before using them! - -Once the package is successfully installed into the package root, \fImakepkg\fP -will prepare some documentation. It will -then strip debugging info from libraries and binaries and generate a meta-info -file. Finally, it will compress everything into a .fpm file and leave it -in the directory you ran \fBmakepkg\fP from. - -At this point you should have a package file in the current directory, named -something like name-version-release-arch.fpm. Done! - -.SH Install/Upgrade/Remove Scripting -Pacman has the ability to store and execute a package-specific script when it -installs, removes, or upgrades a package. This allows a package to "configure -itself" after installation and do the opposite right before it is removed. - -The exact time the script is run varies with each operation: -.TP -.B pre_install -script is run right before files are extracted. - -.TP -.B post_install -script is run right after files are extracted. - -.TP -.B pre_upgrade -script is run right before files are extracted. - -.TP -.B post_upgrade -script is run after files are extracted. - -.TP -.B pre_remove -script is run right before files are removed. - -.TP -.B post_remove -script is run right after files are removed. - -.RE -To use this feature, just create a file (eg, pkgname.install) and put it in -the same directory as the PKGBUILD script. Then use the \fIinstall\fP directive: -.RS -.nf -install=pkgname.install -.fi -.RE - -The install script does not need to be specified in the \fIsource\fP array. -If you omit the install directive then makepkg will check for the -$pkgname.install install and will use it if it's present. - -You can find a scriptlet skeleton in the /docs/tech/skel/ directory, use it -when creating new packages. - -The scriptlet messages are parsed, a simple example tells you everything: -.nf -post_upgrade() -{ - echo "START this will be good" - echo "DONE 0" - echo "START this will fail" - echo "DONE 1" - echo "old message" -} -.fi - -.SH PKGBUILD Directives -.TP -.B pkgname -The name of the package. This has be a unix-friendly name as it will be -used in the package filename. - -.TP -.B pkgver -This is the version of the software as released from the author (eg, 2.7.1). - -.TP -.B pkgrel -This is the release number specific to Archlinux Linux packages. - -.TP -.B pkgdesc -This should be a brief description of the package and its functionality. - -.TP -.B pkgdesc_localized -Array of the localized package descriptions. - -The format is the following: -pkgdesc_localized=('xx_YY foo' 'xx_YY bar') - -.TP -.B url -This field contains an optional URL that is associated with the piece of software -being packaged. This is typically the project's website. - -.TP -.B license -Sets the license type (eg, "GPL", "BSD", "NON-FREE"). (\fBNote\fP: This -option is still in development and may change in the future) - -.TP -.B install -Specifies a special install script that is to be included in the package. -This file should reside in the same directory as the PKGBUILD, and will be -copied into the package by makepkg. It does not need to be included in the -\fIsource\fP array. (eg, install=modutils.install) - -.TP -.B up2date -This directive should contain a command that prints the current upstream stable -version of the project. This way we can check for newer version without visiting -manually the project's website (see above). - -.TP -.B source \fI(array)\fP -The \fIsource\fP line is an array of source files required to build the -package. Source files must reside in the same directory as the PKGBUILD -file, unless they have a fully-qualified URL. Then if the source file -does not already exist in /var/cache/pacman/src, the file is downloaded -by wget. - -.TP -.B md5sums \fI(array)\fP -If this field is present, it should contain an MD5 hash for every source file -specified in the \fIsource\fP array (in the same order). makepkg will use -this to verify source file integrity during subsequent builds. To easily -generate md5sums, first build using the PKGBUILD then run -\fBmakepkg -G >>PKGBUILD\fP. Then you can edit the PKGBUILD and move the -\fImd5sums\fP line from the bottom to an appropriate location. - -.TP -.B sha1sums \fI(array)\fP -If this field is present, it should contain an SHA1 hash for every source file -specified in the \fIsource\fP array (in the same order). makepkg will use -this to verify source file integrity during subsequent builds. To easily -generate sha1sums, first build using the PKGBUILD then run -\fBmakepkg -g >>PKGBUILD\fP. Then you can edit the PKGBUILD and move the -\fIsha1sums\fP line from the bottom to an appropriate location. - -.TP -.B signatures \fI(array)\fP -If this field is present, it should contain an array of gpg signatures required -to validate the source files. Where there is no signature available just leave -it empty, like: - -signatures=(${source[0]}.asc '') - -.TP -.B groups \fI(array)\fP -This is an array of symbolic names that represent groups of packages, allowing -you to install multiple packages by requesting a single target. For example, -one could install all KDE packages by installing the 'kde' group. - -.TP -.B archs \fI(array)\fP -This array defines on which architectures the given package is avalibable. -If it's not available, that will mean that gensync will skip it when generating -package databases. - -.TP -.B backup \fI(array)\fP -A space-delimited array of filenames (without a preceding slash). The -\fIbackup\fP line will be propagated to the package meta-info file for -pacman. This will designate all files listed there to be backed up if this -package is ever removed from a system. See \fBHANDLING CONFIG FILES\fP in -the \fIpacman\fP manpage for more information. - -.TP -.B depends \fI(array)\fP -An array of packages that this package depends on to build and run. Packages -in this list should be surrounded with single quotes and contain at least the -package name. They can also include a version requirement of the form -\fBname<>version\fP, where <> is one of these three comparisons: \fB>=\fP -(greater than equal to), \fB<=\fP (less than or equal to), or \fB=\fP (equal to). -See the PKGBUILD example above for an example of the \fIdepends\fP directive. - -.TP -.B makedepends \fI(array)\fP -An array of packages that this package depends on to build (ie, not required -to run). Packages in this list should follow the same format as \fIdepends\fP. - -.TP -.B rodepends \fI(array)\fP -An array of packages that this package depends on to run (ie, not required to -build). Generally \fIrodepends\fP should be avoided in favour of \fIdepends\fP -except where this will create circular dependency chains. (For example building -logrotate doesn't requires to have dcron installed.) Packages in this list -should follow the same format as \fIdepends\fP. - -.TP -.B conflicts \fI(array)\fP -An array of packages that will conflict with this package (ie, they cannot both -be installed at the same time). This directive follows the same format as -\fIdepends\fP except you cannot specify versions here, only package names. - -.TP -.B provides \fI(array)\fP -An array of "virtual provisions" that this package provides. This allows a package -to provide dependency names other than it's own package name. For example, the -kernel-scsi and kernel-ide packages can each provide 'kernel' which allows packages -to simply depend on 'kernel' rather than "kernel-scsi OR kernel-ide OR ..." - -.TP -.B replaces \fI(array)\fP -This is an array of packages that this package should replace, and can be used to handle -renamed/combined packages. For example, if the kernel package gets renamed -to kernel-ide, then subsequent 'pacman -Syu' calls will not pick up the upgrade, due -to the differing package names. \fIreplaces\fP handles this. - -.TP -.B options \fI(array)\fP -This is an array of various boolean options. The possible values are: -.nf -nodocs Don't add any documentation automatically (ie. when there'll be - a separate documentation subpackage). -nostrip Don't strip binaries/libraries. -force This is used to force the package to be upgraded by --sysupgrade, - even if its an older version. -nobuild If this directive set, gensync will ignore this package, so users - must build these packages on their machines, they will not be able - to install them with pacman -S. Useful for closed-source, but - freeware programs. -nofakeroot Don't drop privileges after chrooting. Required by some broken - packages. -scriptlet Don't skip executing scriptlets even if we're in chroot. -.fi - -.SH What is the process of chrooted build ? - -First, what is chroot? We currently use fakeroot to prevent build() from -modifying the host system, and we use a prefix or DESTDIR directive to install -everything to a directory and not under to the host system. This is good, but -not enough. - -This system lacks of the ability to control the list of installed packages -during the build on the system of a packager, the given compiled package maybe -linked itself to an extra installed library. This way we can't really control -the list of real dependencies. For example if libquicktime is installed from -source on my system, then mplayer or any other program can link itself to that, -and so that depends() will be incorrect. Or if I have the closed source binary -NVidia drivers installed, some programs link tho NVidia's libraries. - -Of course there is a sollution to avoid this, to use a real chroot instead of a -simple fakeroot. What is this means? The followings: - -When starting the build, a core chroot system is installed under /var/chroot. -(Of course you can change this value under /etc/makepkg.conf.) The core system -contains ~60 packages which are must installed to build any package in -a chrooted environment. These packages (for example gcc, kernel-headers, make) -should not be mentioned in makedepends(). 'pacman -Sg core chroot-core -devel-core' should show you the actial list. (We try to change this list rarely -of course.) - -When you start building with makepkg -R, pacman will install these packages to -/var/chroot if necessary. This will produce a fully "clean" Archlinux system, -that consits of base packages only. This /var/chroot is fully separated from -the host system so that this will solve the problems mentioned above. -(Linking to a library installed from source, etc.) - -Here comes the fun part. The packages listed in depends() and makedepends() are -installed to this clean (/var/chroot) system. From this point, this chroot is -capable to build the specified package in it without any unnecessary package -installed, fully separated from the host system. - -After this the chroot should be cleaned up which means the removal of the -installed depends() and makedepends(). This ensures us not to build from -scratch the core chroot. - -This way we can prevent lots of dependency problems and it is even possible to -build packages for a different Archlinux version. This is quite efficent when -building security updates or fixing critical bugs in the -stable tree. - -If the build is failed, the working directory will not be deleted, you can find -it under /var/chroot/var/tmp/fst. Later if you want to clean your chroot -(delete the working directory and remove unnecessary packages) you can use 'makepkg -CR'. - -To activate building in a chroot, you should run makepkg as root at least with -the -R option. - -.SH Package splitting - -Package splitting means moving out a list of specifed files to subpackages (like -libmysql out of mysql) and then defining the properties of subpackages. - -NOTE: if you create several subpackages, maintaining those packages will -require more and more time. Thus, unnecessary splits aren't welcome. -Especially, if you split out a library, then don't move the headers to the -package just to speed up building with a few seconds! - -The \fBsubpkgs()\fP array is to define the pkgnames of the subpackages. From -now all the directives has their subfoo equivalent: -.nf -pkgname -> subpkgs() -pkgdesc -> subdescs() -pkgdesc_localized -> subdescs_localized() -license() -> sublicense() -replaces() -> subreplaces() -groups() -> subgroups() -depends() -> subdepends() -rodepends() -> subrodepends() -removes() -> subremoves() -conflicts() -> subconflicts() -provides() -> subprovides() -backup() -> subbackup() -install -> subinstall() -options -> suboptions() -archs -> subarchs() -.fi - -Also note that bash does not support two-dimensional arrays, so when defining the -array of arrays, then quotes are the major separators and spaces are the minor ones. - -Simple example: -.nf -Add the followings to your bottom of your PKGBUILD -subpkgs=('foo' 'bar') -subdescs=('desc of foo' 'desc of bar') -subdepends=('foodep1 foodep2' 'bardep1 bardep2') -subgroups=('apps' 'apps') -subarchs=('i686 x86_64' 'i686 x86_64') -.fi - -You may define conflicts, replaces and other directives for your subpackages, but -the requirement is only to define these 5 ones. - -The second part is to move some files to the - just defined - subpackages. You -should use the Fsplit command for this at the end of your build() function. You -can read more about Fsplit in the fwmakepkg documentation, but here is a short -example: -.nf - -Fsplit subpkgname usr/share/ - -.fi -This will move the /usr/share dir of the package to the "subpkgname" subpackage. - -NOTE: never use a trailing slash when defining file patterns, especially if you -use wildcards in it! - -.SH "SEE ALSO" -.BR makepkg (8), -.BR pacman (8) -.SH AUTHOR -.nf -Judd Vinet <jvinet(a)zeroflux.org> -and the Frugalware developers <frugalware-devel(a)frugalware.org> -.fi

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (package.c)
by Aaron Griffin 06 Feb '07

06 Feb '07

Date: Tuesday, February 6, 2007 @ 12:41:37 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: package.c (1.58 -> 1.59) Copy-pasta errors. 8) -----------+ package.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.58 pacman-lib/lib/libalpm/package.c:1.59 --- pacman-lib/lib/libalpm/package.c:1.58 Tue Feb 6 12:39:32 2007 +++ pacman-lib/lib/libalpm/package.c Tue Feb 6 12:41:36 2007 @@ -125,7 +125,7 @@ /* Is pkgB an upgrade for pkgA ? */ int alpm_pkg_compare_versions(pmpkg_t *pkgA, pmpkg_t *pkgB) { - if(spkg->force) { + if(pkgB->force) { /* skip the version compare call if this is a 'force' package */ return(1); } @@ -133,21 +133,21 @@ /* compare versions and see if we need to upgrade */ int cmp = alpm_versioncmp(pkgA->version, pkgB->version); - if(cmp > 0 && !spkg->force) { + if(cmp > 0) { /* local version is newer */ - pmdb_t *db = spkg->data; + pmdb_t *db = pkgB->data; _alpm_log(PM_LOG_WARNING, _("%s: local (%s) is newer than %s (%s)"), - local->name, local->version, db->treename, spkg->version); + pkgA->name, pkgA->version, db->treename, pkgB->version); cmp = 0; - } else if(alpm_list_find_str(handle->ignorepkg, spkg->name)) { + } else if(alpm_list_find_str(handle->ignorepkg, pkgB->name)) { /* package should be ignored (IgnorePkg) */ _alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (%s)"), - local->name, local->version, spkg->version); + pkgA->name, pkgA->version, pkgB->version); cmp = 0; - } else if(_alpm_pkg_istoonew(spkg)) { + } else if(_alpm_pkg_istoonew(pkgB)) { /* package too new (UpgradeDelay) */ _alpm_log(PM_LOG_DEBUG, _("%s-%s: delaying upgrade of package (%s)"), - local->name, local->version, spkg->version); + pkgA->name, pkgA->version, pkgB->version); cmp = 0; }

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (package.c sync.c)
by Aaron Griffin 06 Feb '07

06 Feb '07

Date: Tuesday, February 6, 2007 @ 12:39:32 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: package.c (1.57 -> 1.58) sync.c (1.98 -> 1.99) Attempt to unify the -S and -Su version comparissons for when a package is newer See FS#5388 -----------+ package.c | 32 ++++++++++++++++++++++++++++++++ sync.c | 34 +++------------------------------- 2 files changed, 35 insertions(+), 31 deletions(-) Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.57 pacman-lib/lib/libalpm/package.c:1.58 --- pacman-lib/lib/libalpm/package.c:1.57 Sun Feb 4 03:26:52 2007 +++ pacman-lib/lib/libalpm/package.c Tue Feb 6 12:39:32 2007 @@ -122,6 +122,38 @@ return; } +/* Is pkgB an upgrade for pkgA ? */ +int alpm_pkg_compare_versions(pmpkg_t *pkgA, pmpkg_t *pkgB) +{ + if(spkg->force) { + /* skip the version compare call if this is a 'force' package */ + return(1); + } + + /* compare versions and see if we need to upgrade */ + int cmp = alpm_versioncmp(pkgA->version, pkgB->version); + + if(cmp > 0 && !spkg->force) { + /* local version is newer */ + pmdb_t *db = spkg->data; + _alpm_log(PM_LOG_WARNING, _("%s: local (%s) is newer than %s (%s)"), + local->name, local->version, db->treename, spkg->version); + cmp = 0; + } else if(alpm_list_find_str(handle->ignorepkg, spkg->name)) { + /* package should be ignored (IgnorePkg) */ + _alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (%s)"), + local->name, local->version, spkg->version); + cmp = 0; + } else if(_alpm_pkg_istoonew(spkg)) { + /* package too new (UpgradeDelay) */ + _alpm_log(PM_LOG_DEBUG, _("%s-%s: delaying upgrade of package (%s)"), + local->name, local->version, spkg->version); + cmp = 0; + } + + return(cmp); +} + /* Helper function for comparing packages */ int _alpm_pkg_cmp(const void *p1, const void *p2) Index: pacman-lib/lib/libalpm/sync.c diff -u pacman-lib/lib/libalpm/sync.c:1.98 pacman-lib/lib/libalpm/sync.c:1.99 --- pacman-lib/lib/libalpm/sync.c:1.98 Sun Feb 4 03:26:52 2007 +++ pacman-lib/lib/libalpm/sync.c Tue Feb 6 12:39:32 2007 @@ -229,24 +229,7 @@ } /* compare versions and see if we need to upgrade */ - cmp = alpm_versioncmp(local->version, spkg->version); - if(cmp > 0 && !spkg->force) { - /* local version is newer */ - pmdb_t *db = spkg->data; - _alpm_log(PM_LOG_WARNING, _("%s: local (%s) is newer than %s (%s)"), - local->name, local->version, db->treename, spkg->version); - } else if(cmp == 0) { - /* versions are identical */ - } else if(alpm_list_find_str(handle->ignorepkg, spkg->name)) { - /* package should be ignored (IgnorePkg) */ - _alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (%s)"), - local->name, local->version, spkg->version); - } else if(_alpm_pkg_istoonew(spkg)) { - /* package too new (UpgradeDelay) */ - _alpm_log(PM_LOG_DEBUG, _("%s-%s: delaying upgrade of package (%s)"), - local->name, local->version, spkg->version); - /* check if spkg->name is already in the packages list. */ - } else { + if(alpm_pkg_compare_versions(local, spkg)) { _alpm_log(PM_LOG_DEBUG, _("%s-%s elected for upgrade (%s => %s)"), local->name, local->version, local->version, spkg->version); if(!find_pkginsync(spkg->name, trans->packages)) { @@ -260,8 +243,6 @@ goto error; } trans->packages = alpm_list_add(trans->packages, sync); - } else { - /* spkg->name is already in the packages list -- just ignore it */ } } } @@ -344,17 +325,8 @@ local = _alpm_db_get_pkgfromcache(db_local, spkg->name); if(local) { - cmp = alpm_versioncmp(local->version, spkg->version); - if(cmp > 0 && !spkg->force) { - /* local version is newer -- get confirmation before adding */ - int resp = 0; - QUESTION(trans, PM_TRANS_CONV_LOCAL_NEWER, local, NULL, NULL, &resp); - if(!resp) { - _alpm_log(PM_LOG_WARNING, _("%s-%s: local version is newer -- skipping"), local->name, local->version); - return(0); - } - } else if(cmp == 0) { - /* versions are identical -- get confirmation before adding */ + if(alpm_pkg_compare_versions(local, spkg) == 0) { + /* spkg is NOT an upgrade, get confirmation before adding */ int resp = 0; QUESTION(trans, PM_TRANS_CONV_LOCAL_UPTODATE, local, NULL, NULL, &resp); if(!resp) {

1 0

[pacman-dev] CVS update of pacman-lib (4 files)
by dan＠archlinux.org 06 Feb '07

06 Feb '07

Date: Sunday, February 4, 2007 @ 13:28:21 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: AUTHORS (1.6 -> 1.7) TODO.dan (1.2 -> 1.3) etc/makepkg.conf.in (1.9 -> 1.10) scripts/makepkg (1.41 -> 1.42) * Updated makepkg to use a new form of options. These two arrays now replace most of the former options in makepkg.conf, and are described in detail there: BUILDENV=(fakeroot !distcc color !ccache) OPTIONS=(strip !docs !libtool emptydirs) Note that PKGBUILD specified options will always have final say. They will now be specified as they are above, except using lowercase 'options' array. * makepkg was fixed so options actually work as expected. ---------------------+ AUTHORS | 2 - TODO.dan | 58 +++++++++++++++++------------------ etc/makepkg.conf.in | 48 +++++++++++++++-------------- scripts/makepkg | 82 +++++++++++++++++++++++++++++++++++++------------- 4 files changed, 117 insertions(+), 73 deletions(-) Index: pacman-lib/AUTHORS diff -u pacman-lib/AUTHORS:1.6 pacman-lib/AUTHORS:1.7 --- pacman-lib/AUTHORS:1.6 Fri Jan 19 04:28:44 2007 +++ pacman-lib/AUTHORS Sun Feb 4 13:28:21 2007 @@ -1,6 +1,7 @@ Judd Vinet <jvinet(a)zeroflux.org> Aurelien Foret <aurelien(a)archlinux.org> Aaron Griffin <aaron(a)archlinux.org> +Dan McGee <dan(a)archlinux.org> Miklós Vajna <vmiklos(a)frugalware.org> Christian Hamar <krics(a)linuxforum.hu> @@ -8,6 +9,5 @@ Josh Wheeler <deltalima(a)gmail.com> David Kimpe <DNAku(a)frugalware.org> -Dan McGee <dpmcgee(a)gmail.com> James Rosten <seinfeld90(a)gmail.com> Roman Kyrylych <Roman.Kyrylych(a)gmail.com> Index: pacman-lib/TODO.dan diff -u pacman-lib/TODO.dan:1.2 pacman-lib/TODO.dan:1.3 --- pacman-lib/TODO.dan:1.2 Wed Jan 31 01:55:40 2007 +++ pacman-lib/TODO.dan Sun Feb 4 13:28:21 2007 @@ -2,12 +2,6 @@ This is my personal TODO list. No guarantees if it is out of date and things no longer apply. If you want to help out with any of it, send me an email. -* Variable names in makepkg.conf--confusing - - some use 'USE_', others do not - - some are 'NO', some are 'KEEP', etc. - - some options use 0/1, others are y/n -* Should undocumented makepkg (and thus PKGBUILD) options be put in the - manpage, as well as including sections for them in the makepkg.conf file? * Go through all makepkg bugs in flyspray and see if they are rectified: http://bugs.archlinux.org/index.php?tasks=&project=1&string=makepkg @@ -19,27 +13,19 @@ * Port the libdownload (libfetch) manpage from BSD style to Linux style, or at very least change references to BSD. -* Revise build system to a more static one (Aaron mentioned wmii system). - -* NEWS file updating and cleanup. Get rid of items that are bugfixes of never- - released code, etc. - -* New cache cleaning functionality in pacman - keep installed version, choose - number to keep, etc. Good python script in the forums that we should try to - emulate, perhaps. -* pacman - downgrade feature - allow users to see cached packages and +* Pacman 3.1 - New cache cleaning functionality in pacman - keep installed + version, choose number to keep, etc. Good python script in the forums that + we should try to emulate, perhaps. +* Pacman 3.1 - downgrade feature - allow users to see cached packages and downgrade to (previous or any?) available options. -* alpm_log_action & install script logging interaction - producing duplicate - entries in pacman logs (possibly fixed? needs more testing but looks good) - -* Extreme similarity between some of the sync and add code...we have to be able - to abstract more away from sync actions and add actions to just 'actions' - (example: sync,c, add.c, and deptest.c all contain a switch on PM_DEP_MOD_*) - -* Merge update, add, and sync code when possible, so we reduce duplication. +* Pacman 3.1 - Extreme similarity between some of the sync and add code...we + have to be able to abstract more away from sync actions and add actions to + just 'actions' (example: sync,c, add.c, and deptest.c all contain a switch + on PM_DEP_MOD_*). Merge update, add, and sync code when possible, so we + reduce duplication. -* For Pacman 3.1 - List every function, define, etc. in libalpm. Give one +* Pacman 3.1 - List every function, define, etc. in libalpm. Give one sentence description of each. If it sounds like two are similar, find a way to combine or refactor them. If it is unnecessary- delete it. Stop keeping everything clustered in little add/sync/remove parts, allow transactions to @@ -49,14 +35,28 @@ are still relevant, etc. Ideas for -Re (#6273), changing meaning of -c (has two meanings, another FS bug), etc. -* Monotone suggestion- allow changing of a branch name after commit (example: - I meant to commit to a new branch, but I forgot --branch option on the - commit. Can I remove the original branch cert and replace it with a new - one?) +* Pacman 3.1 - Possible rewrite of make system. Options: + -- revise to be more static (Aaron mentioned wmii's system) + -- Cmake? It looks intriguing + +* Pacman 3.1 - Rewrite _alpm_sortbydeps to use Topological Sort. Should work + using a standard topo sort algorithm, once the crazy types can be fixed up + a bit. Include a cycle check - print a big error message if this happens. + -- http://en.wikipedia.org/wiki/Topological_sort + -- http://everything2.com/?node_id=556079 Quick hits: -* log_progress and cb_trans_progress - same function? not quite but commonality +* log_progress and cb_trans_progress - same function? not quite but close * unsigned int vs. unsigned * 'ldd' & 'ldd -u' - many linkages * possibly split utilities/extras from pacman package * makepkg3 produces files with arch appended- gensync can't deal with it +* FS #4185 - move where message is logged, perhaps? +* Remove -A flag (and possibly -D, -T, and -Y?) +* ideas mentioned here - http://bbs.archlinux.org/viewtopic.php?id=29450 + add a .install message about mirrors, maybe comment whole file, encourage + rankmirrors usage +* update copyrights +* update pacman website +* finish pacman coding style page +* make indent.pro file for GNU indent Index: pacman-lib/etc/makepkg.conf.in diff -u pacman-lib/etc/makepkg.conf.in:1.9 pacman-lib/etc/makepkg.conf.in:1.10 --- pacman-lib/etc/makepkg.conf.in:1.9 Sat Feb 3 00:23:27 2007 +++ pacman-lib/etc/makepkg.conf.in Sun Feb 4 13:28:21 2007 @@ -1,4 +1,4 @@ -# vim: set ft=sh ts=2 sw=2 et: +# # /etc/makepkg.conf # @@ -31,36 +31,38 @@ # BUILD ENVIRONMENT ######################################################################### # -#-- Fakeroot: for building packages as a non-root user -USE_FAKEROOT="y" -#-- DistCC: a distributed C/C++/ObjC compiler (modify MAKEFLAGS too) -USE_DISTCC="n" -#-- A space-delimited list of hosts running in the DistCC cluster -DISTCC_HOSTS="" -#-- Colorized output messages -USE_COLOR="y" -#-- Use ccache when building -USE_CCACHE=0 +# Defaults: ENVIRONMENT=(!fakeroot !distcc color !ccache) +# +#-- fakeroot: Allow building packages as a non-root user +#-- distcc: Use the Distributed C/C++/ObjC compiler +#-- color: Colorize output messages +#-- ccache: Use ccache to cache compilation +# +BUILDENV=(fakeroot !distcc color !ccache) +# +#-- If using DistCC, your MAKEFLAGS will also need modification. In addition, +#-- specify a space-delimited list of hosts running in the DistCC cluster. +#DISTCC_HOSTS="" ######################################################################### # GLOBAL PACKAGE OPTIONS # These are default values for the options=() settings ######################################################################### # -#-- Don't strip symbols from binaries/libraries -NOSTRIP=0 -#-- Keep doc and info directories -KEEPDOCS=0 -#-- Don't remove libtool files? -NOLIBTOOL=0 -#-- Don't remove empty directories from package? -NOEMPTYDIRS=0 +# Default: OPTIONS=(strip !docs !libtool emptydirs) +# +#-- strip: Strip symbols from binaries/libraries +#-- docs: Save doc and info directories +#-- libtool: Leave libtool (.la) files in binaries +#-- emptydirs: Leave empty directories in binaries +# +OPTIONS=(strip !docs !libtool emptydirs) + #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 -INTEGRITY_CHECK=(md5) -#-- Info and doc directories to be removed +INTEGRITY_CHECK=(md5 sha1) +#-- Info and doc directories to remove (if option set correctly above) DOC_DIRS=(usr/{,share/}{info,doc} opt/gnome/{,share/}{info,doc,gtk-doc}) - ######################################################################### # PACKAGE OUTPUT ######################################################################### @@ -71,3 +73,5 @@ #SRCDEST=/var/cache/pacman/src #-- Packager: name/email of the person or organization building packages #PACKAGER="John Doe <john(a)doe.com>" + +# vim: set ft=sh ts=2 sw=2 et: Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.41 pacman-lib/scripts/makepkg:1.42 --- pacman-lib/scripts/makepkg:1.41 Sat Feb 3 00:21:55 2007 +++ pacman-lib/scripts/makepkg Sun Feb 4 13:28:21 2007 @@ -32,7 +32,7 @@ PKGEXT="pkg.tar.gz" source "/etc/abs/abs.conf" -SRCROOT=$ABSROOT +SRCROOT="$ABSROOT" # Options CLEANUP=0 @@ -63,7 +63,7 @@ ### SUBROUTINES ### plain() { - if [ "$USE_COLOR" = "Y" -o "$USE_COLOR" = "y" ]; then + if [ ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then echo -e " \033[1;1m$1\033[1;0m" >&2 else echo " $1" >&2 @@ -71,7 +71,7 @@ } msg() { - if [ "$USE_COLOR" = "Y" -o "$USE_COLOR" = "y" ]; then + if [ ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then echo -e "\033[1;32m==>\033[1;0m \033[1;1m$1\033[1;0m" >&2 else echo "==> $1" >&2 @@ -79,7 +79,7 @@ } msg2() { - if [ "$USE_COLOR" = "Y" -o "$USE_COLOR" = "y" ]; then + if [ ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then echo -e " \033[1;34m->\033[1;0m \033[1;1m$1\033[1;0m" >&2 else echo " -> $1" >&2 @@ -87,7 +87,7 @@ } warning() { - if [ "$USE_COLOR" = "Y" -o "$USE_COLOR" = "y" ]; then + if [ ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then echo -e "\033[1;33m==> WARNING:\033[1;0m \033[1;1m$1\033[1;0m" >&2 else echo "==> WARNING: $1" >&2 @@ -95,7 +95,7 @@ } error() { - if [ "$USE_COLOR" = "Y" -o "$USE_COLOR" = "y" ]; then + if [ ! "$USE_COLOR" = "n" -a "$(check_buildenv color)" = "y" ]; then echo -e "\033[1;31m==> ERROR:\033[1;0m \033[1;1m$1\033[1;0m" >&2 else echo "==> ERROR: $1" >&2 @@ -106,16 +106,54 @@ echo "$1" | sed 's|^.*://.*/||g' } +# checks to see if options are present in makepkg.conf or PKGBUILD; +# PKGBUILD options always take precedence check_option() { + local needle=$(echo $1 | tr [:upper:] [:lower:]) local i + # loop PKGBUILD opts first so it overrides makepkg.conf for i in ${options[@]}; do - local uc=$(echo $i | tr [:lower:] [:upper:]) local lc=$(echo $i | tr [:upper:] [:lower:]) - if [ "$uc" = "$1" -o "$lc" = "$1" ]; then - echo $1 + if [ "$lc" = "$needle" ]; then + echo "y" + return + elif [ "$lc" = "!$needle" ]; then + echo "n" + return + fi + done + # fall back to makepkg.conf options + for i in ${OPTIONS[@]}; do + local lc=$(echo $i | tr [:upper:] [:lower:]) + if [ "$lc" = "$needle" ]; then + echo "y" + return + elif [ "$lc" = "!$needle" ]; then + echo "n" + return + fi + done + echo "unknown" + return +} + +# check if option is present in BUILDENV +check_buildenv() { + local needle=$(echo $1 | tr [:upper:] [:lower:]) + local i + # use options from makepkg.conf + for i in ${BUILDENV[@]}; do + local lc=$(echo $i | tr [:upper:] [:lower:]) + if [ "$lc" = "$needle" ]; then + echo "y" + return + elif [ "$lc" = "!$needle" ]; then + echo "n" return fi done + echo "unknown" + return } in_array() { @@ -123,7 +161,7 @@ shift 1 [ -z "$1" ] && return 1 for i in $*; do - [ "$i" == "$needle" ] && return 0 + [ "$i" = "$needle" ] && return 0 done return 1 } @@ -347,7 +385,7 @@ --syncdeps) DEP_BIN=1 ;; --sudosync) DEP_SUDO=1 ;; --builddeps) DEP_SRC=1 ;; - --noccache) USE_CCACHE=0 ;; + --noccache) USE_CCACHE="n" ;; --nodeps) NODEPS=1 ;; --noextract) NOEXTRACT=1 ;; --install) INSTALL=1 ;; @@ -370,7 +408,7 @@ while getopts "bBcCdefghij:Lmop:rRsS-" opt; do case $opt in b) DEP_SRC=1 ;; - B) USE_CCACHE=0 ;; + B) USE_CCACHE="n" ;; c) CLEANUP=1 ;; C) CLEANCACHE=1 ;; d) NODEPS=1 ;; @@ -498,7 +536,7 @@ # Enter the fakeroot environment if necessary. This will call the makepkg script again # as the fake root user. We detect this by passing a sentinel option (-F) to makepkg if [ "$EUID" != "0" ]; then - if [ "$USE_FAKEROOT" = "y" -o "$USE_FAKEROOT" = "Y" ]; then + if [ "$(check_buildenv fakeroot)" = "y" ]; then if [ $(type -p fakeroot) ]; then msg "Entering fakeroot environment" fakeroot -- $0 -F $ARGLIST @@ -514,7 +552,7 @@ else warning "Running makepkg as an unprivileged user will result in non-root" plain "ownership of the packaged files. Try using the fakeroot" - plain "environment. (USE_FAKEROOT=y in makepkg.conf)" + plain "environment. ('fakeroot' in BUILDENV in makepkg.conf)" plain "" sleep 1 fi @@ -746,12 +784,13 @@ mkdir -p $startdir/pkg # use distcc if requested - if [ "$USE_DISTCC" = "y" ]; then + if [ "$(check_buildenv distcc)" = "y" ]; then [ -d /usr/lib/distcc/bin ] && export PATH=/usr/lib/distcc/bin:$PATH fi # use ccache if it's available - if [ "$USE_CCACHE" = "1" ]; then + # USE_CCACHE still here because it is a command line option + if [ ! "$USE_CCACHE" = "n" -a "$(check_buildenv ccache)" = "y" ]; then [ -d /usr/lib/ccache/bin ] && export PATH=/usr/lib/ccache/bin:$PATH fi @@ -799,7 +838,7 @@ fi fi -if [ ! "$(check_option KEEPDOCS)" -a "$KEEPDOCS" = "0" ]; then +if [ "$(check_option docs)" = "n" ]; then # remove info/doc files msg "Removing info/doc files..." cd $startdir/pkg @@ -833,7 +872,7 @@ cd $startdir # strip binaries -if [ ! "$(check_option NOSTRIP)" -a "$NOSTRIP" = "0" ]; then +if [ "$(check_option strip)" = "y" ]; then msg "Stripping debugging symbols from libraries..." find pkg/{,usr,usr/local,opt/*}/lib -type f -not -name "*.dll" -not -name "*.exe" \ -exec /usr/bin/strip --strip-debug '{}' \; 2>&1 \ @@ -845,15 +884,16 @@ fi # remove libtool (.la) files -if [ "$(check_option NOLIBTOOL)" -a "$NOLIBTOOL" = "1" ]; then +if [ "$(check_option libtool)" = "n" ]; then msg "Removing libtool .la files..." find pkg -type f -name "*.la" -exec rm -f -- '{}' \; fi # remove empty directories -if [ "$(check_option NOEMPTYDIRS)" -a "$NOEMPTYDIRS" = 1 ]; then +if [ "$(check_option emptydirs)" = "n" ]; then msg "Removing empty directories..." - find pkg -depth -type d -empty -delete; + cd "$startdir/pkg" + find -depth -type d -empty -delete; fi # get some package meta info

3 2

[pacman-dev] CVS update of pacman-lib/scripts (makepkg)
by dan＠archlinux.org 06 Feb '07

06 Feb '07

Date: Tuesday, February 6, 2007 @ 01:54:13 Author: dan Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.42 -> 1.43) * Added some backwards compatability stuff to makepkg, along with helpful warnings so people aren't caught off guard in the future. * Added a temp fix for a bug in file 4.19 where bziped tarballs were returning type "application/empty". ---------+ makepkg | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.42 pacman-lib/scripts/makepkg:1.43 --- pacman-lib/scripts/makepkg:1.42 Sun Feb 4 13:28:21 2007 +++ pacman-lib/scripts/makepkg Tue Feb 6 01:54:13 2007 @@ -120,6 +120,16 @@ elif [ "$lc" = "!$needle" ]; then echo "n" return + # START DEPRICATED + # TODO This code should be removed in the next release of makepkg + elif [ "$lc" = "no$needle" ]; then + warning "Options beginning with 'no' will be depricated in the next version of makepkg!" + plain "Please replace 'no' with '!': no$needle -> !$needle." + echo "n" + return + elif [ "$lc" = "keepdocs" -a "$needle" = "docs" ]; then + warning "Option 'keepdocs' may not work as intended. Please replace with 'docs'." + # END DEPRICATED fi done # fall back to makepkg.conf options @@ -542,17 +552,16 @@ fakeroot -- $0 -F $ARGLIST exit $? else - warning "Fakeroot is not installed. Building as an unprivileged user" - plain "will result in non-root ownership of the packaged files." - plain "Install the fakeroot package to correctly build as a non-root" - plain "user." + warning "Fakeroot is not installed. Building as an unprivileged user" + plain "will result in non-root ownership of the packaged files. Install" + plain "the fakeroot package to correctly build as a non-root user." plain "" sleep 1 fi else warning "Running makepkg as an unprivileged user will result in non-root" - plain "ownership of the packaged files. Try using the fakeroot" - plain "environment. ('fakeroot' in BUILDENV in makepkg.conf)" + plain "ownership of the packaged files. Try using the fakeroot environment" + plain "by placing 'fakeroot' in the BUILDENV array in makepkg.conf." plain "" sleep 1 fi @@ -738,6 +747,12 @@ file_type=$(file -biz "$file") unset cmd case "$file_type" in + # START REMOVE + # TODO remove this with release of file v4.20, temp bugfix + *application/empty*) + cmd="tar -xf $file" ;; + warning "file had trouble detecting type, assuming tar" + # END REMOVE *application/x-tar*) cmd="tar -xf $file" ;; *application/x-zip*)

1 0

[pacman-dev] CVS update of pacman-lib (3 files)
by Aaron Griffin 05 Feb '07

05 Feb '07

Date: Saturday, February 3, 2007 @ 22:24:32 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: lib/libalpm/package.c (1.55 -> 1.56) src/pacman/add.c (1.29 -> 1.30) src/pacman/log.c (1.26 -> 1.27) * Added archive verification when loading package metadata for -u and -A operations (now aborts on a corrupt archive) * Fixed the pm_fprintf newline error that was plaguing us. It seems a line resetting 'neednl' was removed a while back (by me). This causes all the output errors we've been seeing -----------------------+ lib/libalpm/package.c | 43 +++++++++++++++++++++++++++---------------- src/pacman/add.c | 2 +- src/pacman/log.c | 6 +++--- 3 files changed, 31 insertions(+), 20 deletions(-) Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.55 pacman-lib/lib/libalpm/package.c:1.56 --- pacman-lib/lib/libalpm/package.c:1.55 Wed Jan 31 22:00:34 2007 +++ pacman-lib/lib/libalpm/package.c Sat Feb 3 22:24:32 2007 @@ -237,7 +237,7 @@ pmpkg_t *_alpm_pkg_load(char *pkgfile) { char *expath; - int i; + int ret = ARCHIVE_OK; int config = 0; int filelist = 0; int scriptcheck = 0; @@ -254,32 +254,36 @@ RET_ERR(PM_ERR_WRONG_ARGS, NULL); } - if ((archive = archive_read_new ()) == NULL) + if((archive = archive_read_new()) == NULL) { RET_ERR(PM_ERR_LIBARCHIVE_ERROR, NULL); + } - archive_read_support_compression_all (archive); - archive_read_support_format_all (archive); + archive_read_support_compression_all(archive); + archive_read_support_format_all(archive); - if (archive_read_open_file (archive, pkgfile, ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) + if (archive_read_open_file(archive, pkgfile, ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) { RET_ERR(PM_ERR_PKG_OPEN, NULL); + } info = _alpm_pkg_new(NULL, NULL); if(info == NULL) { - archive_read_finish (archive); + archive_read_finish(archive); RET_ERR(PM_ERR_MEMORY, NULL); } /* TODO there is no reason to make temp files to read * from a libarchive archive, it can be done by reading - * directly from the archive */ - for(i = 0; archive_read_next_header (archive, &entry) == ARCHIVE_OK; i++) { + * directly from the archive + * See: archive_read_data_into_buffer + * requires changes 'parse_descfile' as well + * */ + + /* Read through the entire archive for metadata. We will continue reading + * even if all metadata is found, to verify the integrity of the archive in + * full */ + while((ret = archive_read_next_header (archive, &entry)) == ARCHIVE_OK) { const char *entry_name = archive_entry_pathname(entry); - if(config && filelist && scriptcheck) { - /* we have everything we need */ - break; - } - if(strcmp(entry_name, ".PKGINFO") == 0) { /* extract this file into /tmp. it has info for us */ descfile = strdup("/tmp/alpm_XXXXXX"); @@ -343,18 +347,25 @@ } if(archive_read_data_skip(archive)) { - _alpm_log(PM_LOG_ERROR, _("bad package file in %s"), pkgfile); + _alpm_log(PM_LOG_ERROR, _("error while reading package: %s"), archive_error_string(archive)); + pm_errno = PM_ERR_LIBARCHIVE_ERROR; goto error; } expath = NULL; } - archive_read_finish(archive); + if(ret != ARCHIVE_EOF) { /* An error occured */ + _alpm_log(PM_LOG_ERROR, _("error while reading package: %s"), archive_error_string(archive)); + pm_errno = PM_ERR_LIBARCHIVE_ERROR; + goto error; + } if(!config) { - _alpm_log(PM_LOG_ERROR, _("missing package info file in %s"), pkgfile); + _alpm_log(PM_LOG_ERROR, _("missing package metadata"), pkgfile); goto error; } + archive_read_finish(archive); + if(!filelist) { _alpm_log(PM_LOG_ERROR, _("missing package filelist in %s, generating one"), pkgfile); info->files = all_files; Index: pacman-lib/src/pacman/add.c diff -u pacman-lib/src/pacman/add.c:1.29 pacman-lib/src/pacman/add.c:1.30 --- pacman-lib/src/pacman/add.c:1.29 Sat Feb 3 02:29:51 2007 +++ pacman-lib/src/pacman/add.c Sat Feb 3 22:24:32 2007 @@ -77,7 +77,7 @@ for(i = targets; i; i = i->next) { if(alpm_trans_addtarget(i->data) == -1) { MSG(NL, "\n"); - ERR(NL, _("failed to add target '%s' (%s)\n"), (char *)i->data, alpm_strerror(pm_errno)); + ERR(NL, _("failed to add target '%s' (%s)"), (char *)i->data, alpm_strerror(pm_errno)); retval = 1; goto cleanup; } Index: pacman-lib/src/pacman/log.c diff -u pacman-lib/src/pacman/log.c:1.26 pacman-lib/src/pacman/log.c:1.27 --- pacman-lib/src/pacman/log.c:1.26 Wed Jan 31 01:10:22 2007 +++ pacman-lib/src/pacman/log.c Sat Feb 3 22:24:32 2007 @@ -126,19 +126,19 @@ } fprintf(file, str); + if(needpad == 1) { unsigned int i, cols = getcols(); for(i=len; i < cols; ++i) { fprintf(file, " "); } - if(neednl == 1) { + if(neednl == 1 && line == NL) { fprintf(file, "\n"); neednl = 0; - } else { - neednl = 1; } } fflush(file); + neednl = (str[strlen(str)-1] == '\n') ? 0 : 1; } /* Check verbosity option and, if set, print the

2 1