summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Collapse)AuthorAge
* Fix whitespace in makepkg.sh.in and makepkg-template.pl.inJason St. John2013-07-30
| | | | | | | | Replace spaces with tabs in one instance. Remove extra spaces. Signed-off-by: Jason St. John <jstjohn@purdue.edu> Signed-off-by: Allan McRae <allan@archlinux.org>
* Install makedepends and checkdepends togetherAshley Whetter2013-07-22
| | | | | | | Fixes FS#31557 Signed-off-by: Ashley Whetter <awhetter.2011@my.bristol.ac.uk> Signed-off-by: Allan McRae <allan@archlinux.org>
* Update gitignore files for use with autoreconfAllan McRae2013-07-22
| | | | Signed-off-by: Allan McRae <allan@archlinux.org>
* Remove autotools filesAllan McRae2013-07-22
| | | | Signed-off-by: Allan McRae <allan@archlinux.org>
* Merge branch 'maint'Allan McRae2013-06-26
|\
| * Respect paths with spaces on --installAndrea Scarpino2013-06-23
| | | | | | | | | | | | | | makepkg --install doesn't quote the absolute path, so if the path contains spaces pacman -U fails. Signed-off-by: Allan McRae <allan@archlinux.org>
* | Merge branch 'maint'Allan McRae2013-06-18
|\|
| * Pull translation updatesAllan McRae2013-06-18
| | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
| * makepkg: fix typo for distcc testAllan McRae2013-06-16
| | | | | | | | | | | | Introduced in commit 9dd42dc0. Fixes FS#35741. Signed-off-by: Allan McRae <allan@archlinux.org>
* | repo-add; add option to remove existing package files from diskPhillip Smith2013-06-06
| | | | | | | | | | | | | | | | | | | | | | When maintaining a custom repo, often it is undesirable to retain older versions of packages. This patch adds the --remove option to remove the current package file and it's signature from disk before adding the new one to the database. Documentation is also updated. This is an optional flag and default behaviour (leaving ondisk files alone) is not changed. Signed-off-by: Phillip Smith <fukawi2@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
* | Merge branch 'maint'Allan McRae2013-06-06
|\|
| * Pull translation updates and regenerateAllan McRae2013-06-06
| | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
| * pacman-key: Do not reinterpret keys from revoked keyringsDave Reisner2013-06-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given a revoked keyring containing only: BC1FBE4D2826A0B51E47ED62E2539214C6C11350 We should only disable this specific keyid. This change enforces that the contents of the -revoked keyring file are full fingerprints which can uniquely identify a key. Before: # pacman-key --populate archlinux ==> Appending keys from archlinux.gpg... ==> Locally signing trusted keys in keyring... -> Locally signing key 0E8B644079F599DFC1DDC3973348882F6AC6A4C2... -> Locally signing key 684148BB25B49E986A4944C55184252D824B18E8... -> Locally signing key 44D4A033AC140143927397D47EFD567D4C7EA887... -> Locally signing key 27FFC4769E19F096D41D9265A04F9397CDFD6BB0... -> Locally signing key AB19265E5D7D20687D303246BA1DFB64FFF979E7... ==> Importing owner trust values... ==> Disabling revoked keys in keyring... -> Disabling key 1390420191... -> Disabling key E2539214C6C11350... -> Disabling key 8544EA82113502DE... ==> Updating trust database... gpg: next trustdb check due at 2014-01-22 After: # pacman-key --populate archlinux ==> Appending keys from archlinux.gpg... ==> Locally signing trusted keys in keyring... -> Locally signing key 0E8B644079F599DFC1DDC3973348882F6AC6A4C2... -> Locally signing key 684148BB25B49E986A4944C55184252D824B18E8... -> Locally signing key 44D4A033AC140143927397D47EFD567D4C7EA887... -> Locally signing key 27FFC4769E19F096D41D9265A04F9397CDFD6BB0... -> Locally signing key AB19265E5D7D20687D303246BA1DFB64FFF979E7... ==> Importing owner trust values... ==> Disabling revoked keys in keyring... -> Disabling key BC1FBE4D2826A0B51E47ED62E2539214C6C11350... ==> Updating trust database... gpg: next trustdb check due at 2014-01-22 Partially addresses FS#35478. This does nothing to confirm whether or not the key was successfully disabled -- a ridiculously simple request which appears to be far too difficult for gpg to manage. Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Allan McRae <allan@archlinux.org>
| * Restrict pkgname from starting with a dot.Allan McRae2013-06-04
| | | | | | | | | | | | | | | | | | Adding this restriction means we can filter any FILENAME entry from starting with a "/" or a ".". Use the term "dot" as it is more computing relevant compared to "full stop" or "period" which vary depending on English locale. Signed-off-by: Allan McRae <allan@archlinux.org>
* | makepkg-template: add --version and some license infoFlorian Pritz2013-05-30
| | | | | | | | | | Signed-off-by: Florian Pritz <bluewind@xinu.at> Signed-off-by: Allan McRae <allan@archlinux.org>
* | makepkg-template: Stop using given/whenFlorian Pritz2013-05-29
| | | | | | | | | | | | | | | | | | given/when has been marked experimental in perl 5.18 because it will change it 5.20. if/else is ugly, but hiding the generated warning is no good solution either, so we us if/else for now. Signed-off-by: Florian Pritz <bluewind@xinu.at> Signed-off-by: Allan McRae <allan@archlinux.org>
* | makepkg-template: Add gettext supportFlorian Pritz2013-05-29
| | | | | | | | | | | | | | | | This also slighty changes the word order in the description for --newest. Signed-off-by: Florian Pritz <bluewind@xinu.at> Signed-off-by: Allan McRae <allan@archlinux.org>
* | Add makepkg-templateFlorian Pritz2013-05-29
| | | | | | | | | | | | | | This allows for somewhat easy templating for PKGBUILDs. Signed-off-by: Florian Pritz <bluewind@xinu.at> Signed-off-by: Allan McRae <allan@archlinux.org>
* | makepkg: add support for CARCH environment varPhillip Smith2013-05-29
| | | | | | | | | | | | | | | | | | | | Add support for overriding configuration in /etc/makepkg.conf and ~/.makepkg.conf by setting the environment variable CARCH similar to how SRCDEST and PKGDEST behave. Fixes FS#35030. Signed-off-by: Allan McRae <allan@archlinux.org>
* | makepkg: remove support for PKGBUILDs without a package() functionAllan McRae2013-05-29
| | | | | | | | | | | | | | | | | | | | | | Not having a package() function means all building occurs as root and repackaging can lose permissions. Given the use of package() functions has been around for years and we deprecated not having one in pacman-4.1, we can remove support for PKGBUILDs without package() functions altogether. However, keep PKGBUILDs that have neither a build() or package() function working. Signed-off-by: Allan McRae <allan@archlinux.org>
* | makepkg: Add helper to test for functions in build scriptAllan McRae2013-05-29
| | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
* | makepkg: remove sourcing PKGBUILD from stdinAllan McRae2013-05-29
| | | | | | | | | | | | | | | | | | Using PKGBUILDs from stdin means that we can not use pkgver() in packages. Given we have the "-p" option to pass any file to makepkg and passing a PKGBUILD in the form "cat foo | makepkg" does not work, this feature is unneeded. Signed-off-by: Allan McRae <allan@archlinux.org>
* | Merge branch 'maint'Allan McRae2013-05-29
|\|
| * makepkg: Use LOGDEST for logpipeAllan McRae2013-05-18
| | | | | | | | | | | | | | If LOGDEST is set, we may not check that $startdir is writable. Store the log pipe in LOGDEST instead. Signed-off-by: Allan McRae <allan@archlinux.org>
| * makepkg: fixup broken revision and repo referencesDave Reisner2013-05-18
| | | | | | | | | | | | | | | | | | | | | | | | bzr support "worked", but didn't handle any of the actual features we wanted with makepkg. This moves the revision specification to the proper place (extraction, rather than download), and fixes an additional broken reference to $repo which was never set. Fixes FS#35281. Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Allan McRae <allan@archlinux.org>
* | Merge branch 'maint'Allan McRae2013-05-07
|\|
| * More translation updatesAllan McRae2013-05-07
| | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
| * Pull translation updates from transifexAllan McRae2013-04-30
| | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
| * Add -V/--version option to makepkg's usage function and man pageEric Bélanger2013-04-30
| | | | | | | | | | Signed-off-by: Eric Bélanger <snowmaniscool@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
| * makepkg: avoid redirecting stdoutDave Reisner2013-04-28
| | | | | | | | | | | | | | | | | | | | If stdout is already redirected, redirecting stderr to stdout can lead to undesirable results. Fixes FS#34974. Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Allan McRae <allan@archlinux.org>
| * Fix spelling errors using 'codespell' toolAnatol Pomozov2013-04-18
| | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
| * makepkg: fix svn repo extractionAllan McRae2013-04-12
| | | | | | | | | | | | | | Copy SVN repos rather than using "svn export" to keep all anotation files in the repo for build scripts that use (e.g.) "svin info". Signed-off-by: Allan McRae <allan@archlinux.org>
| * Do not use checkout directory for SVN configAllan McRae2013-04-12
| | | | | | | | | | | | | | | | Using the checkout directory for the SVN config can result in clashes between config files and files from the SVN checkout. Instead, use a ".makepkg" directory within the checkout. Signed-off-by: Allan McRae <allan@archlinux.org>
| * Add support for all bzr URLs in the PKGBUILD source arrayMaxime Gauduin2013-04-11
| | | | | | | | | | | | | | | | | | | | Add support for all bzr URLs, including "lp:" URLs, in the source array. This, however, requires an internet connection and will fall back to the current behavior for offline builds. In that case, only the URL reported by 'bzr config parent_location' run inside the local repo can be used, and is outputted. Signed-off-by: Maxime Gauduin <alucryd@gmail.com>
| * makepkg: don't run remove_deps twice when unneededWilliam Giokas2013-04-11
| | | | | | | | | | | | | | | | | | | | remove_deps already has a check and won't run unless -r is specified, so if this was meant to remove dependencies of a failure no matter what, then it's not doing it, and with -r it is run twice on a failure for no real reason. Signed-off-by: William Giokas <1007380@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
* | Add --noprepare option to makepkgEric Bélanger2013-04-30
| | | | | | | | | | | | | | | | This new option disables the prepare function. Useful in combination with -o to get an unpatched copy of the sources for testing purpose. Signed-off-by: Eric Bélanger <snowmaniscool@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
* | makepkg: avoid file|grep dependency for CRLF checkDave Reisner2013-04-06
| | | | | | | | | | Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Allan McRae <allan@archlinux.org>
* | makepkg: remove extra ansi color codesAndrew Gregory2013-04-06
|/ | | | | | | | All those extra '\e[1;'s were just setting bold redundantly or immediately being cancelled. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
* Update translations from transifexAllan McRae2013-04-01
| | | | Signed-off-by: Allan McRae <allan@archlinux.org>
* remove continue from download_localDaniel Wallace2013-04-01
| | | | | | | | | | Bug exposed by a6291858cc1570e56204c4a1e7a68f76c4853336 popd doesn't run in the for loop in download_sources() if the continue in download_files is executed. Causing the extract_files to extract everything into $SRCDEST instead of $srcdir Signed-off-by: Allan McRae <allan@archlinux.org>
* makepkg: unset GREP_OPTIONSAndrew Gregory2013-03-31
| | | | | | | | | | grep allows options to be set from the environment with GREP_OPTIONS. Many of these options will alter grep's output, breaking makepkg. GREP_OPTIONS=--line-number breaks installed dependency removal, for instance. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
* Ensure we are always in $SRCDEST before downloadingAllan McRae2013-03-30
| | | | | | | | | | | When VCS sources were updated, we changed into their root directory. Any following source was then downloaded to an incorrect place causing a failure in makepkg. Ensure we are always in the $SRCDEST directory before starting any download. Fixes FS#34488. Signed-off-by: Allan McRae <allan@archlinux.org>
* Remove duplicate optionAllan McRae2013-03-26
| | | | | | | The "skippgpcheck" option was specified twice. Also, fix alphabetical ordering. Signed-off-by: Allan McRae <allan@archlinux.org>
* More translation updatingAllan McRae2013-03-17
| | | | | | | Pull updates from transifex. Add new "id" translation. Regerate po files with updated filelists... Signed-off-by: Allan McRae <allan@archlinux.org>
* repo-add: Update copyright yearAllan McRae2013-03-15
| | | | | | Also adjust translations. Signed-off-by: Allan McRae <allan@archlinux.org>
* Merge updates from TransifexAllan McRae2013-03-15
| | | | Signed-off-by: Allan McRae <allan@archlinux.org>
* Remove Indonesian translationAllan McRae2013-03-15
| | | | | | | | I imported this translation from transifex without realising that there was no strings translated despite being "acitve" on transifex for quite some time. Remove it until translation begins... Signed-off-by: Allan McRae <allan@archlinux.org>
* Revert "makepkg: Use a recursive git clone."Allan McRae2013-03-14
| | | | | | | | | | | | | This reverts commit 8b03b1a8776043978aeac31682f94d65b4f3e514. It is much better to download the submodules using separate source entries and adjust the submodule configs to point at these versions in the prepare() function. See https://mailman.archlinux.org/pipermail/pacman-dev/2013-March/016771.html for an example. Signed-off-by: Allan McRae <allan@archlinux.org>
* pkgdelta: fix improper passing of file argumentDave Reisner2013-03-14
| | | | | | | Looks like I hosed this pretty hard in 5a5e712c749edb8. Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Allan McRae <allan@archlinux.org>
* Update all translations files to push to TransifexAllan McRae2013-03-10
| | | | | | Run update-po and fix the few errors reported. Signed-off-by: Allan McRae <allan@archlinux.org>