summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2009-01-20alpm_unpack : change prefix handling to workaround FS#12148.Xavier Chantry1-8/+24
Instead of appending the prefix to each entry name, we can chdir to the prefix before extracting, and restoring when it is done. This seems to work better with the strange and special case of FS#12148 where an archive contained the "./" entry. Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
2009-01-18Merge branch 'maint'Dan McGee2-4/+4
2009-01-18makepkg: test fixes, part 2Dan McGee1-19/+19
The goal of this fix was empty string comparisons: - if [ "$pkgname" != "" ]; then + if [ -n "$pkgname" ]; then Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-18makepkg: clean up test usageDan McGee1-50/+51
In a lot of places, we had the following construct: [ "$foobar" = "0" ] which is better represented by using the integer tests: [ $foobar -eq 0 ] Attempt to unify makepkg to use the latter rather than the former in all places. From here on out we should ensure anything that is set to 0, 1, etc. uses the -eq format rather than =. In addition, fix a few other test anomalies including usage of double equals. Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-18Use archive_entry_set_perm instead of archive_entry_set_modeNagy Gabor2-4/+4
This patch fixes FS#12148 ('unstable' regular file). I also changed the other archive_entry_set_mode usage in add.c to archive_entry_set_perm. Since I cannot find any relevant info in libarchive manual, I quote Tim Kientzle (the author of libarchive) here, and I say thank you for his help. *** Tim Kientzle wrote ************************************* This is the problem in libalpm/util.c: 323 if(S_ISREG(st->st_mode)) { 324 archive_entry_set_mode(entry, 0644); 325 } else if(S_ISDIR(st->st_mode)) { 326 archive_entry_set_mode(entry, 0755); 327 } Your example unstable.db.tar.gz is not empty. It has one entry in it, called "./". That entry is marked as a directory. But, when you call archive_entry_set_mode(), you are changing the file type! archive_read_extract() then creates the file /var/unstable as you requested. (archive_read_extract() will replace an empty directory with a file.) You should either set the mode value correctly: 323 if(S_ISREG(st->st_mode)) { 324 archive_entry_set_mode(entry, IFREG | 0644); 325 } else if(S_ISDIR(st->st_mode)) { 326 archive_entry_set_mode(entry, IFDIR | 0755); 327 } Or use archive_entry_set_perm(), which does not change the file type: 323 if(S_ISREG(st->st_mode)) { 324 archive_entry_set_perm(entry, 0644); 325 } else if(S_ISDIR(st->st_mode)) { 326 archive_entry_set_perm(entry, 0755); 327 } ************************************************************ Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-17makepkg: repackage rework with package functionsAllan McRae1-20/+28
When using the optional package() function or split packages, the entire packaging step is rerun instead of just final package creation step. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-17Fixed some inconsistencies and errors in the pactest documentation.Bryan Ischo1-9/+16
Signed-off-by: Bryan Ischo <bryan@ischo.com> Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-17Merge branch 'am/splitpkg'Dan McGee4-14/+205
* am/splitpkg: makepkg: implement creation of split packages makepkg: Optional argument for run_package and create_package makepkg: hack around tee in run_package function makepkg: add functions for backup and restore of package fields makepkg: add optional package function makepkg: Add PKGBUILD-split.proto
2009-01-16makepkg: implement creation of split packagesAllan McRae1-16/+47
Adds the ability to create multiple packages from one PKGBUILD Signed-off-by: Allan McRae <allan@archlinux.org>
2009-01-16makepkg: Optional argument for run_package and create_packageAllan McRae1-6/+20
Generalize run_package to allow the passing of a package name directing the use of an alternative package function. A similar adjustment to create_package to prepare split packages. Signed-off-by: Allan McRae <allan@archlinux.org>
2009-01-16makepkg: hack around tee in run_package functionAllan McRae1-1/+10
Piping the package function through tee to log the outut also clears any variables set in the package function. This is a problem in split packages as package variable overrides are done in the package function. This is fixed by creating a node which the output is piped through and duplicated using the tee function. Signed-off-by: Allan McRae <allan@archlinux.org>
2009-01-16makepkg: add functions for backup and restore of package fieldsAllan McRae1-1/+22
Adds functions for the backup and restoration of package variables that can be over-ridden during package splitting. Variables which can be overridden are given in the splitpkg_overrides variable. Signed-off-by: Allan McRae <allan@archlinux.org>
2009-01-16makepkg: add optional package functionAllan McRae2-2/+63
This patch allows us to split the building and packaging stages of a PKGBUILD and minimize fakeroot usage. This can be done with less code duplication (run_build and run_package look quite similiar) but the run_package function will be where the package splitting logic is implemented in the future. Signed-off-by: Allan McRae <allan@archlinux.org>
2009-01-16makepkg: Add PKGBUILD-split.protoAllan McRae2-1/+56
Prototype PKGBUILD for package splitting in makepkg Signed-off-by: Allan McRae <allan@archlinux.org>
2009-01-15Make the repo-add quiet flag less quietAaron Griffin1-3/+2
Considering one can easily run: repo-add .... >/dev/null to get only warnings and errors, the -q flag is mostly useless. Make the -q flag silence only level 2 messages. Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-14makepkg: fix my own stupid mistakeDan McGee1-1/+1
We don't want to bail if a certain integrity check wasn't even provided. Whoops. Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-14makepkg: use INTEGRITY_CHECK only for generation of checksumsAaron Schaefer1-7/+9
Signed-off-by: Aaron Schaefer <aaron@elasticdog.com> [Dan: fail if checksum array is incorrectly sized] Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-13doc: Consistency and formatting cleanups (for master)Dan McGee1-3/+3
Bring master in line with some things we just did on maint. Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-13Merge branch 'maint'Dan McGee4-15/+14
Conflicts: doc/makepkg.conf.5.txt
2009-01-13doc: Consistency and formatting cleanupsDan McGee2-9/+9
Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-13doc: fix some more asciidoc falloutDan McGee2-6/+1
They keep changing things on us. This gets rid of the '.ft C' text sprinkled around our listing blocks. Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-13doc: remove BUILDSCRIPT from makepkg.conf docsDan McGee1-1/+1
Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-13db->pkgcache_loaded and db->grpcache_loadedNagy Gabor2-15/+18
Clearly the old code was more elegant (NULL cache indicated "not loaded"), but it had some drawbacks, so from now on we indicate the state of caches explicitly. Old drawbacks: When we had an empty database (unstable), libalpm called db_populate after every pkgcache access, because NULL pkgcache indicated "not loaded" state. This is not a common case, but the same situation can happen with grpcache, which is more problematic: If the user had a custom repo with no groups, grpcache was always NULL. (grpcache is also loaded per database.) Thus every get_grpcache call induced a load_grpcache operation, so the benefits of grpcache was completely lost. Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-13Rename alpm_get_md5sum to alpm_compute_md5sum and alpm_dep_get_string to ↵Nagy Gabor11-20/+20
alpm_dep_compute_string This patch introduces the following function name convention: _compute_ in function name: the return value must be freed. _get_ in function name: the return value must not be freed. Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-13HoldPkg reworkNagy Gabor11-64/+26
The HoldPkg feature is even more important when the packages to be held are pulled automatically by pacman, in a -Rc and -Rs operation. Before, it only applied when the packages were explicitly requested by the user to be removed. This patch extends holdpkg to -Rc and -Rs by doing the HoldPkg check just before trans_commit. Additionally, the whole HoldPkg stuff was moved to the front-end. I changed the default behavior to "don't remove", so I modified remove030.py pactest as well. See also: FS#9173. Original-work-by: Xavier Chantry <shiningxc@gmail.com> Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-13Remove libdownload support and fix libfetch one.Xavier Chantry3-34/+23
Aaron said to consider libdownload a dead project so libdownload support was removed to more easily fix libfetch one (otherwise many ifdef needed). There was no direct replacement for ferror to detect an error while downloading. So instead, I added a check at the end to see if the file was fully downloaded, which is just a small chunk of code taken from here: http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/net/libfetch/files/fetch.c?only_with_tag=MAIN Signed-off-by: Xavier Chantry <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-13makepkg : fix a lot of breakages caused by AllanXavier Chantry3-27/+18
This patch started as a simple typo fix (pugre instead of purge in two places), as well as a fix of a test which was using PURGE_TARGETS instead of $PURGE_TARGETS. It evolved in a slight handling change of the OPTIONS which have a variable affecting their behavior (strip STRIP_DIRS, docs DOC_DIRS, zipman MAN_DIRS and purge PURGE_TARGETS), as well as a clarification in makepkg.conf. Now when a variable is undefined or empty, the corresponding option will have no effect. It looked weird to have a fallback when a option is defined but empty, it seems more natural to not have any fallbacks. Also re-enable docs by default. It seems arbitrary to delete files from packages by default, and it would be more vanilla and distro agnostic to keep them. docs was also the only negated option. Signed-off-by: Xavier Chantry <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-12Fix linkman macro to work with asciidoc > 8.3.0Dan McGee1-0/+4
Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-07Merge branch 'maint'Dan McGee5-291/+287
2009-01-06Update Czech translationv3.2.2Vojtěch Gondžala2-266/+248
Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-05Update Portuguese (Brazil) translationHugo Doria1-23/+21
Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-04Update configure.ac for 3.2.2 releaseDan McGee1-2/+2
Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-04Update NEWS for 3.2.2Dan McGee1-0/+16
Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-04Merge branch 'maint'Dan McGee17-490/+458
Conflicts: po/it.po
2009-01-04Update Polish translationMateusz Herych2-16/+13
Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-04Update Russian translationSergey Tereschenko1-8/+4
Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-03Update Turkish translationSamed Beyribey2-33/+29
Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-03Update Russian translationSergey Tereschenko2-29/+51
Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-03Update Unkranian translationRoman Kyrylych2-28/+33
Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-03Update Italian translationGiovanni Scafora2-133/+115
Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-03Update German translationMatthias Gorissen2-35/+18
Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-03Update Hungarian translationNagy Gabor1-18/+7
Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-03Update Chinese translation甘露(Gan Lu)1-118/+101
Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-03Update French translationXavier Chantry1-29/+12
Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
2009-01-03Update Spanish translationJuan Pablo González Tognarelli2-79/+84
Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-03Merge branch 'maint'Dan McGee4-3/+33
2009-01-03makepkg: Add support for specifying LDFLAGSAllan McRae3-1/+7
Provide support for specifying LDFLAGS within makepkg.conf but leaves this undefined by default. Fixes FS#12542. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-03makepkg: move BUILDSCRIPT from makepkg.confAllan McRae4-2/+12
Commit 4b183bf9 moved makepkg.conf sourcing to after the parsing of options, breaking the -p option and --help output. The solution is to move BUILDSCRIPT out of makepkg.conf. This patch moves the definition BUILDSCRIPT back to makepkg itself and adds configure option to allow easy changing of this value during build time. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-03makepkg: Introduce purge optionAllan McRae3-4/+27
The purge option, combined with the PURGE_TARGETS variable, allows makepkg to automatically remove commonly confliting or removed files (e.g. /usr/share/info/dir, *.pod). Original work: Tim Yang Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
2009-01-03makepkg: Add used options to PKGINFO fileAllan McRae1-3/+14
Adds defined options to the PKGINFO file in the form of "makepkgopt =". It may be useful to be able to add these to the pacman DB at some point as that would allow (e.g.) checking which packages have had their docs striped (FS#7092). Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-09 06:13:15 +0100