1
0
mirror of https://github.com/moparisthebest/pacman synced 2024-11-10 11:35:00 -05:00
Commit Graph

450 Commits

Author SHA1 Message Date
Dan McGee
636610432a Allow GIT version to be used in pacman builds
Add a new configure flag, --enable-git-version, that allows the output of
'git describe' to be used in the version string associated with this
package. This could aid in debugging for users that are using a development
version of pacman and we should be able to figure out which cut of code they
are using.

Sample output:
$ pacman --version
Pacman v3.1.4-190-g4cfa-dirty - libalpm v2.3.1

$ makepkg --version
makepkg (pacman) 3.1.4-190-g5861-dirty

Signed-off-by: Dan McGee <dan@archlinux.org>
2008-05-31 12:06:34 -05:00
Allan McRae
c1a5616c26 makepkg - add check for valid options in PKGBUILD
This patch removes the code block in makepkg that checked for depreciated
options in a PKGBUILD and provided a workaround.  Unknown and depreciated
options are upgraded to error conditions.

Also, removed TODO regarding including install script if exists and $install
is unset.  That should never happen.

Signed-off-by: Allan McRae <mcrae_allan@hotmail.com>
Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-05-29 06:37:20 -05:00
Allan McRae
9577c07d86 No error in makepkg when removing deps fails
Catches error from when pacman is unable to remove dependencies after
successfully building package and prints warning.  Fixes FS#10039.

Signed-off-by: Allan McRae <mcrae_allan at hotmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-05-29 06:37:19 -05:00
Sebastian Nowicki
c33cabd675 Use chown 0:0 instead of root.root
On BSD systems using a dot as a separator is not allowed. On Mac OSX it
is deprecated. A colon should be used instead. BSD systems also use the
"wheel" group instead of "root" to indicate the "super user" group. Both
groups use the id of 0.

Signed-off-by: Sebastian Nowicki <sebnow@gmail.com>
Acked-by: Aaron Griffin <aaronmgriffin@gmail.com>
Acked-by: Dan McGee <dan@archlinux.org>
Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-05-29 06:37:14 -05:00
Sebastian Nowicki
20ae871940 Use "legacy mode" on Mac OSX (for file command)
For some reason `file` on Mac OSX has different arguments than BSD and
Linux; -i no longer prints out the mime strings. With the environment
variable COMMAND_MODE set to "legacy", `file` behaves more like it does
on Linux and BSD, i.e., `file -i` prints the mime type.

Signed-off-by: Sebastian Nowicki <sebnow@gmail.com>
Acked-by: Dan McGee <dan@archlinux.org>
Acked-by: Aaron Griffin <aaronmgriffin@gmail.com>
Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-05-29 06:37:14 -05:00
Sebastian Nowicki
b9369a747d Allow an unprivileged user to create packages without fakeroot
When fakeroot was not in BUILDENV and the user was not root, makepkg still
tried to use fakeroot for building packages.
BUILDENV is now checked to see if fakeroot is enabled. If it is not enabled the
package can still be built, but root will not have ownership of files. This is
useful when users want to make packages for personal use and don't care about
ownership.

Closes FS#10450.

Signed-off-by: Sebastian Nowicki <sebnow@gmail.com>
Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-05-29 06:37:14 -05:00
Xavier Chantry
149839c539 du -b is not available on BSD, use du -k instead.
This fixes FS#10459.

There is apparently no portable ways to get the apparent size of a file,
like du -b does. So the best compromise seems to get the block size in kB,
and then convert that to byte so that we keep compatibility.

Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-05-29 06:37:14 -05:00
Sebastian Nowicki
1d71079c5b Replace usage of "cp -s" with the more portable "ln -s"
The "-s" argument does not exist on BSD, and neither does
"--remove-destination". This patch replaces the calls to "cp -s
--remove-destination" with the equivalent "rm -f" and "ln -s" calls, in
order to increase portability.

Signed-off-by: Sebastian Nowicki <sebnow@gmail.com>
Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-05-29 06:37:13 -05:00
Dan McGee
ae5ef3b90f Remove --builddeps from makepkg
This really should be in an external script, as it is not makepkg's job to
rebuild your system.

Signed-off-by: Dan McGee <dan@archlinux.org>
2008-05-13 16:01:34 -05:00
Dan McGee
2edd01a973 scripts: add -q/--quiet option to repo-add and repo-remove
They are pretty noisy scripts in their normal course of operations, so allow
all messages to be squashed except for warning and error messages with this
new flag.

Signed-off-by: Dan McGee <dan@archlinux.org>
2008-05-10 00:48:55 -05:00
Dan McGee
502645c0e3 makepkg: Unify start and end messages
I've always found it odd why the package version is shown at the start but
not the end of the package build. Fix it, and while we are at it, add the
$CARCH variable to the display too.

Signed-off-by: Dan McGee <dan@archlinux.org>
2008-05-10 00:48:47 -05:00
Dan McGee
5389cdf654 Merge branch 'maint' 2008-04-29 19:52:06 -05:00
Daenyth Blank
27943a04d6 makepkg: fix strip section to allow spaces in paths
Inside tidy_install, change the section which strips libraries to use find |
while read rather than for foo in `find`. This should allow whitespaces in
filenames to still be processed correctly.

This fixes FS#10294.

Signed-off-by: Daenyth Blank <Daenyth+git@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-04-27 14:18:43 -05:00
Chantry Xavier
dae3f9deef Add zipman makepkg option.
All other steps in tidy_install function were already controlled by an
option in makepkg.conf, so this patch adds an option for the man page
compression step too.
This will allow to keep man pages uncompressed, which is required for some
special meta man page, like the zshall one (see FS#4580).

Ref: http://www.archlinux.org/pipermail/pacman-dev/2008-March/011472.html

Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
2008-03-16 23:22:17 +01:00
Roman Kyrylych
f56f7ff391 makepkg: Support for resuming source downloads
Download to *.part and remove the suffix if successful, thus md5sums will be
checked only for complete files, and next time makepkg will resume
downloading of partial file instead of complaining about invalid md5sums.

Old DLAGENTS format is still supported.

Late fix: Do not try to download %u first

The output of grep was not suppressed, thus the output of get_downloadcmd
was wrong because of extra line at the beginning that contained an
unsubstituted (with %o and %u) entry from DLAGENTS.

Signed-off-by: Roman Kyrylych <roman@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-03-10 18:45:58 -05:00
Dan McGee
73ac9f7b27 Merge branch 'maint' 2008-03-01 16:24:42 -06:00
Dan McGee
d49f42ba75 Remove small remnant of old force=y option
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-02-27 13:14:05 -06:00
Dan McGee
4bd52f3fe4 Merge branch 'maint'
Remove gettext() function addition from gensync and updatesync in master as
gettext is no longer used in them anyway.
2008-02-20 18:58:04 -06:00
Mark Constable
420c8846b9 Fix two missing BUILDSCRIPT variables in makepkg.
Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
2008-02-20 18:50:56 -06:00
Dan McGee
3559306546 scripts: allow usage when gettext is not installed
Address the issue of our scripts not working so great when gettext is not
available. This has come up in multiple bug reports, and is relatively easy
to address by adding a simple check and a stub function if gettext was not
found that simply echos the original message.

Addresses concerns from FS#9214 and FS#9607.

Signed-off-by: Dan McGee <dan@archlinux.org>
2008-02-17 21:25:41 -06:00
Dan McGee
6b07b5d345 Merge branch 'maint'
Conflicts:

	lib/libalpm/be_files.c
	lib/libalpm/package.c
2008-02-15 19:40:22 -06:00
Chantry Xavier
17180890a5 makepkg : set sane umask before source extraction.
This fixes FS#9242 and FS#9362.

Set umask before the sources are extracted, and after the /etc/profile.d/*
files are sourced in handledeps.
This sourcing of profile.d files is why umask was moved to the build
function in the first place, as can be seen in commit ac965ed401.

Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
2008-02-11 20:40:43 -06:00
Dan McGee
bfc024eab3 Merge branch 'maint' 2008-02-07 20:16:16 -06:00
Dan McGee
14ee1be1ef makepkg: do a quick check for the VCS binaries
Fixes FS#9230. Ensure we have the VCS binaries available when doing the
development version number checking.

Signed-off-by: Dan McGee <dan@archlinux.org>
2008-02-07 20:09:59 -06:00
Chantry Xavier
e81dec9b8c remove --force option from repo-add.
The force option should only be specified in the PKGBUILD with
options=(force).  This information should be handled like any other meta
info, and there is no need to have a special repo-add option for it.

Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
[Dan: fix up a few more references in contrib/ scripts, etc]
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-02-05 19:35:41 -06:00
Dan McGee
eca30ed66a Merge branch 'maint'
Conflicts:

	contrib/gensync
	contrib/updatesync
2008-02-05 19:31:23 -06:00
Chantry Xavier
69bc5ea5e2 add 'force' to PKGINFO, have repo-add respect it.
Ref: http://www.archlinux.org/pipermail/pacman-dev/2008-January/011023.html
Also see FS#9347 and FS#9349.

Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-02-02 18:55:40 -06:00
Chantry Xavier
37bb99abfa repo-remove: print an error in case of an empty db
When removing the last packages from a database, repo-remove silently
failed. Now an error is printed.

Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-02-02 18:52:37 -06:00
Dan McGee
4fad7855fa Remove gensync and updatesync from normal distribution
Move these two scripts into contrib/, and start the process of de-automaking
them by removing the @sysconfdir@ references and the gettext initialization.
The removal of all gettext will soon follow.

Signed-off-by: Dan McGee <dan@archlinux.org>
2008-02-02 14:12:34 -06:00
Dan McGee
7786bf6024 Add deprecation warnings to gensync and updatesync
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-02-02 13:57:15 -06:00
Alex Merry
b1103a3eaf updatesync: incorrect package deletion logic
Fixes FS#9279.

Signed-off-by: Dan McGee <dan@archlinux.org>
2008-02-02 10:09:06 -06:00
Dan McGee
c028014f96 makepkg: ensure binaries in /opt/* are stripped
The path selection for stripping binaries was slightly off, so any binaries
in subdirectories of opt/ were missed. Fixes FS#9342.

Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-27 21:07:44 -06:00
Chantry Xavier
f950c26307 makepkg : improve determination of svn revision.
The previous sed command matched every line starting with r.
For example, with mpd-svn package in aur, the svn log output was rather big,
and there were several lines starting with r (the actual revision : r7155,
but also other lines starting with reverting and run), so this broke makepkg:

> makepkg
==> Determining latest svn revision...
  -> Version found: 7155
everting
un
sed: -e expression #1, char 27: unterminated `s' command

To make the sed command more bullet proof, I added the -q option of svn log,
which produces a quieter output, without the log.
And I changed the sed command to only match numbers for the revision.

Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-27 11:49:24 -06:00
Chantry Xavier
73ee64d49f workaround for a gettext string starting with --.
Workaround found in Advanced Bash-Scripting Guide, localization section.
"added a \0 (NULL) at the beginning of the sentence."

Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
2008-01-20 14:30:26 -06:00
Dan McGee
003adb7646 makepkg: add check to ensure we have non-URL files in build dir
Pacman 3.0 printed the following message if a file could not be found:
  ERROR: xxx was not found in the build directory and is not a proper URL.

We lost this logic in 3.1 when moving to the DLAGENT type stuff, so a
not-found file got passed all the way to the download logic where it failed
with a odd error message. Bring back some logic to ensure only files with
URLs get past a certain point, and fail if the file is not available.

Fixes FS#9208.

Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-20 12:32:37 -06:00
Dan McGee
fd86c62db8 Fix typos in code comments
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-13 23:26:31 -06:00
Dan McGee
ffff094126 makepkg: Oops! Lost the colon after forcever in opts parsing
I screwed this up here:
916e226b78

Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-13 19:16:58 -06:00
Scott Horowitz
916e226b78 makepkg: Introduce --holdver option to prevent bumped pkgrel
This allows us to keep the --forcever option internal to makepkg.

Fixes FS#9194.

Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-13 18:42:26 -06:00
Chantry Xavier
8186dc11a9 Ensure correct dir permissions in the database.
Fix for FS#9176.
A previous commit (6e8daa553b) already forced all database files to 644.
Now the directories are also forced to 755.

Additionally, repo-add now sets the umask to 022, just like makepkg does, to
fix the problem at its root.

Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-13 12:51:37 -06:00
Travis Willard
bbe02ec57f Update Gensync and Updatesync to use new PKGEXT variable
Previously, this caused both scripts to look for
pkgname-pkgver-pkgrel-arch..pkg.tar.gz - extra period has been removed.

Fixes FS#9190.

Signed-off-by: Travis Willard <travis@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-13 12:21:36 -06:00
Dan McGee
b1a231427b makepkg: Ensure we include all manpage directories in compression line
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-09 18:33:12 -06:00
Karolina Lindqvist
33f6fda8b6 makepkg: add package name to output when installing package
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-09 18:33:11 -06:00
Dan McGee
dd5bc808ea makepkg: Fix issues with --asroot and building dependencies
The --asroot option was not passed to recursive calls of makepkg.

In addition, a 'cd' call was done only on the fakeroot branch instead of
both fakeroot and root branches. Move it outside the conditional.

Noticed-by: Karolina Lindqvist <karolina.lindqvist@kramnet.se>
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-08 09:15:30 -06:00
Dan McGee
6f86f46c96 Remove makeworld from pacman package
This is an Arch-specific tool (although others could find use in it), so
off to the standalone ABS package it goes.

Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-06 10:42:35 -06:00
Dan McGee
e0e33c329f Remove hardcoded DBEXT value from script
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-06 09:44:28 -06:00
Dan McGee
14e4366c78 makepkg: add application/zip to the recognized types
The recent upgrade of magic.mime in the file program changed the mime type
output to application/zip instead of application/x-zip as it is a registered
type. Unfortunately we then just skipped zip file extraction becuase of this
change.

Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-05 16:44:43 -06:00
Gustavo Chain
728b601f7b scripts: extra exit() calls in usage() function
Remove the exit() calls from usage as they should be handled by the caller.

Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-05 16:44:43 -06:00
Dan McGee
c26039240d Remove mentions of ABS from makepkg
Kill off some of the $ABSROOT stuff that was still hanging around in there.

Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-05 14:35:40 -06:00
Dan McGee
fbd88a8212 Remove .FILELIST generation from makepkg (and elsewhere)
This is something pacman can do on its own straight from the archive, and we
will reduce the chance of problems occurring becuase of inproper FILELIST
generation as we have had in the past with special characters in filenames.

Once we remove it from makepkg. we can remove any usage of it from all of
our other tools, including pacman, pactest, and contrib/ utilities.

Note that removing it from pacman uncovered a few other bugs anyway, so this
was probably a good move.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-12-29 11:58:23 -06:00
K. Piche
c84feb92db Makepkg missing check for empty pkgname
I thought it was wierd that makepkg didn't do a sanity check for the
$pkgname.  This makes for a simple first try at a GIT patch.

Signed-off-by: K. Piche <kevin@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-12-28 19:54:45 -06:00
Dan McGee
9addd88a7d Do not move man pages to a non-FHS location
Fixes Arch Linux bug FS#8839.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-12-21 15:47:30 -06:00
Dan McGee
741fa31603 Remove abs from the pacman repository
abs has always been an Arch Linux specific tool, and although it is used
primarily by pacman and makepkg, it should not be included with a distro-
agnostic tarball. In addition, maintenance of the script would be better
outside of pacman and would allow for more frequent updates.

This also facilitates our move away from a cvsup/csup dependent tool for
syncing PKGBUILDs.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-12-21 11:05:38 -06:00
Chantry Xavier
ebae8bd009 update of translation-help and fix a typo in gensync.
Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
2007-12-19 18:21:27 -06:00
Dan McGee
20bad3b839 Set the default packager to "Unknown Packager"
There is no real reason to make it look like someone that can't bother to
set the packager variable is official in any way, so remove the Arch Linux
reference from makepkg.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-12-16 22:00:12 -06:00
Dan McGee
9781d0d637 Update GNU GPL boilerplate and copyright dates
Update the GPL boilerplate to direct people to the GNU website for a copy of
the license, as well as bump all of Judd's copyrights to 2007.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-12-10 22:55:39 -06:00
Allan McRae
9615d82343 Compress hard linked man pages
This fixes FS#5392.  If hard links are present for a man page, all
other hard linked files are removed, the man page is zipped and the
hard links are updated to the newly compress man page.

Signed-off-by: Allan McRae <mcrae_allan@hotmail.com>
[Dan: use find -samefile option, don't fail if one of mandirs is
nonexistent]
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-12-04 18:55:44 -06:00
Dan McGee
dbc2f902db pacman-optimize: add note saying sync would be helpful
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-11-13 20:56:15 -06:00
Nathan Jones
c29209e7b6 repo-add: Ensure only adding package's deltas.
repo-add was adding the delta files of any package that started with the
same package name plus a hyphen.

In this example, deltatest-libs delta files were added to the deltatest
package:

$ repo-add deltatest.db.tar.gz deltatest-1.0.2-1-i686.pkg.tar.gz
==> Extracting database to a temporary location...
==> Adding package 'deltatest-1.0.2-1-i686.pkg.tar.gz'
  -> Removing existing package 'deltatest-1.0.2-1'...
  -> Creating 'desc' db entry...
  -> Computing md5 checksums...
  -> Creating 'depends' db entry...
  -> Creating 'deltas' db entry...
  -> Added delta 'deltatest-1.0.2rc3-1_to_1.0.2-1-i686.delta'
  -> Added delta 'deltatest-libs-1.0.0-1_to_1.0.1-1-i686.delta'
==> Creating updated database file /tmp/deltatest.db.tar.gz

Signed-off-by: Nathan Jones <nathanj@insightbb.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-11-13 00:13:21 -06:00
Giovanni Scafora
5cd6ffda72 makeworld: gettext support
Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-11-11 09:42:19 -06:00
Roman Kyrylych
6f5ee2432c makepkg: remove .pacsave files when uninstalling dependencies
Signed-off-by: Roman Kyrylych <roman@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-11-11 09:39:39 -06:00
Scott Horowitz
dd2d6f980b Correctly handle version comparisons for SVN/CVS/etc PKGBUILDS.
Retrieve SVN/CVS/etc revision number before checking if the
package has already been built. This allows building a newer
version of a developmental package without having to use -f.
Now -f will only be needed if the latest SVN/CVS/etc revision
is the same as the built package.

Signed-off-by: Scott Horowitz <stonecrest@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-11-08 07:15:37 -06:00
Sebastian Nowicki
cb04b3a5f3 Fix mercurial complaining about directory already existing
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-11-05 21:10:35 -06:00
Roman Kyrylych
4a5e7b6bd1 Add support for arch='any'
Signed-off-by: Roman Kyrylych <roman@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-11-04 09:50:04 -06:00
Dan McGee
ccdf29ffa8 abs: prefer csup to cvsup
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-10-30 08:12:09 -05:00
Dan McGee
3e3e7a97a6 makepkg: add explicit dir to find calls
Some of the find calls did not have a path, which isn't valid in some
versions of the find utility. Add a . for compatibility.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-10-28 21:18:39 -05:00
Scott Horowitz
8a9c83dd4b Integrate versionpkg into makepkg
If PKGBUILDs use the correct svn/cvs/etc variables, determine the latest
revision number and force this as the pkgver for building.

Signed-off-by: Scott Horowitz <stonecrest@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-10-26 22:35:23 -05:00
Dan McGee
b609cb0a5d makepkg: readd -p option that was lost in getopt conversion
The -p option was accidentally dropped in commit
54b71f0427. Readd it.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-10-26 18:36:58 -05:00
Nathan Jones
1118e00fe9 Add delta information to the repository database.
(Dan: cleaned up one if statement)

Signed-off-by: Nathan Jones <nathanj@insightbb.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-10-19 19:20:16 -05:00
Andrew Fyfe
12e1346252 scripts/makepkg.sh.in: Strip bins/libs in all {bin, sbin, lib} directories.
In one of the original clean up patches[1] I changed the search path
for stripping binaries and libraries. This resulted in only
usr/{bin,sbin,lib} being searched. This patch reverts that change.

[1] 721ceee1e2

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-10-18 19:28:02 -05:00
Nathan Jones
abce73de4c Manually check xdelta exit codes.
This is needed because 'xdelta delta' returns 1 even when the delta
creation succeeds. This was causing makepkg to exit after the command
due to bash's -e option.

Some information from the xdelta man page:
The delta command exits with status 0 to indicate that no differences
were found, with status 1 to indicate that some differences were found,
and with status 2 to indicate an error of some kind.

Signed-off-by: Nathan Jones <nathanj@insightbb.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-10-14 17:54:32 -05:00
Dan McGee
f5f4650de7 pacman-optimize: add check for diff/diffutils
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-10-08 20:46:55 -05:00
Nathan Jones
02ec82b8c6 makepkg: Fix typo to make xdelta creation work.
Signed-off-by: Nathan Jones <nathanj@insightbb.com>
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2007-10-04 17:50:29 -05:00
Dan McGee
d5fa2da171 makepkg: Fix output color codes for real
Make sure we reset both the bold attribute and the color attributes when it
is necessary.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-09-28 12:45:14 -05:00
Dan McGee
69d68ef0b5 makepkg: When we add an option, we should probably make it work
The -A,--ignorearch option was added and given help text, but never actually
listed as valid to the option parser. Fix this.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-09-28 00:36:48 -05:00
Aaron Griffin
48bf088e65 Use ANSI 'foreground' color instead of hardcoding 'white'
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2007-09-28 00:25:57 -05:00
Aaron Griffin
47622eef4d Support for localized times in metadata
Packages and DBs now support using the UNIX epoch (seconds since Jan 1, 1970)
for use in builddate and installdate. This will only affect newly built
packages. Old existing packages with the text format are still supported, but
this is deprecated.

In the case of removal of text time support, this code will fail gracefully,
returning the start of the epoch for broken packages.

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2007-09-28 00:25:57 -05:00
Dan McGee
fc0e83f05b Preliminary support for optdepends
Add some alpm functions for getting optdepends, have makepkg include them
in the PKGINFO file, and have a pacman -Qi operation display the raw string
as stored by libalpm.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-09-25 23:02:30 -05:00
Peter Johnson
afdcf7552c Allow rankmirrors to read from stdin
Feature Request #8043 and provided patch. Thanks!

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-09-17 19:48:57 -05:00
Chantry Xavier
3955858a2d rankmirrors : add support for the $repo var in url.
To keep working correctly with url like :
ftp://ftp.archlinux.org/$repo/os/i686
rankmirrors will now replace $repo by core.

Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-09-17 19:32:39 -05:00
Andrew Fyfe
678983d262 scripts/*.sh.in: Clean up and fix a few bugs
repo-add, repo-remove:
		'bsdtar -c * | ...' doesn't work (you need '-f -'). Code clean up
		eliminated this bug.

		Removed the multiple checksum support, pacman now only supports MD5, so
		there's no need for the database to contain multiple checksums.

		Quote all variables containing file/dir names to prevent paths
		containing spaces from causing problems.

		Add msg, warning and error functions.

		General code clean up.

	pacman-optimize:
		Use a sub-directory in /tmp for working files to make it easier to clean
		up at the end.

		Add quotes round $@ in die and die_r, otherwise printf can't display the
		message correctly.

	makepkg:
		Disable colour output if stderr is not a tty.

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-09-06 19:28:57 -05:00
Andrew Fyfe
3e418a1534 scripts/makepkg.sh.in: Add missing [
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-08-26 13:31:05 -04:00
Chantry Xavier
656c895ca4 makepkg : add -L (--dereference) to file.
makepkg didn't correctly detect the type of the archive
since it didn't dereference symlinks, and so failed
to extract the source tarball.

Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-08-23 14:14:19 -04:00
Andrew Fyfe
47ee89ada9 scripts/makepkg.sh.in: Fix 2 bugs
- Downloaded files weren't being copied to $srcdir
	- Counter wasn't being incremented for checksum checks

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-08-12 21:19:08 -04:00
Andrew Fyfe
ce10b5f1e2 Fix gettext output in repo-{add,remove}
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-07-26 18:59:40 -04:00
Dan McGee
1d97da9450 makepkg: Add note with some required programs for execution
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-07-15 22:31:29 -04:00
Dan McGee
a1e57cbec8 Add --asdeps option to pacman
This replaces the former -D operation that was undocumented and rather
hacky. It can be used with add, upgrade, or sync transactions and will affect
all packages installed. Should close FS #7193.

Also tell makepkg to use this new flag.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-07-15 12:46:02 -04:00
Dan McGee
66b09410b4 Switch repo-add, repo-remove, and pacman-optimize to bsdtar
Relatively straightforward fixes (s/tar/bsdtar/g, add hyphens to options).

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-07-15 10:29:26 -04:00
Andrew Fyfe
fd3a1a92c8 Fix previous makepkg patch, and some pacman output.
makepkg: We still need the source files in $srcdir because PKGBUILDS need
         access to noextract() files and other file not handled by by
         extract_source(). (eg config files)

query.c: Fix some output formating.

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-07-12 15:22:16 -04:00
Andrew Fyfe
142225fd7d FS#7271 - [patch] option for avoiding caching netfiles
Change the behaviour of makepkg so no longer stores a copy of the
source tarball in $srcdir, instead it downloads all sources to $SRCDEST
then extracts them to $srcdir.

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-07-10 11:18:17 -04:00
Dan McGee
573b80405c makepkg: when running as root, cut out some warnings
When running as root, we don't care if fakeroot is installed, and the user
certainly isn't "unprivileged". Cut out these warnings.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-07-10 10:31:03 -04:00
Andrew Fyfe
5e68e9d451 Cleanup of pacman_deptest()
Clean up some left over code from
http://projects.archlinux.org/git/gitweb.cgi?p=pacman.git;a=commitdiff;h=7653bb93997f52848b54ab80868cd6da52808a75

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-07-10 10:15:24 -04:00
Andrew Fyfe
7ec2e088ec scripts/makepkg.sh.in: Add CHOST to the list of variables exported.
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-07-10 10:00:00 -04:00
Andrew Fyfe
7d74572887 Change the exit code for pacman_deptest().
Changed the exit code for missing deps from 1 to 127 because 1 is used
for other errors. makepkg breaks if pacman exits with 1 for any reason
other than a missing dep.

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-07-09 15:57:38 -04:00
Dan McGee
a501b72e40 Make paragraph text in scripts single strings
It is much easier for translators to deal with paragraphs as strings rather
than by lines. Take all usage and version information and convert it to this
format.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-07-06 19:35:32 -04:00
Dan McGee
b5f8a44beb Move scripts from *.in to *.sh.in so gettext can determine type
If we move the scripts from *.in to *.sh.in and *.py.in, gettext can pull the
required strings to translate a whole lot easier. Do this.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-07-06 18:43:24 -04:00
Andrew Fyfe
78bac81a58 scripts/makepkg.in: Don't include .PKGINFO etc in .FILELIST
And move .PKGINFO and .FILELIST to be the first to files included in the
package.

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-06-28 13:45:12 +01:00
Dan McGee
7daa6708d2 Remove lockfile configuration from frontend, make it job of libalpm
I previously introduced some patches to make just about every path in
pacman/libalpm configurable; doing this with the lockfile seemed a bit too
far and we really should just place the lockfile where it belongs- with the
DB that needs locking.

More details in this thread:
http://archlinux.org/pipermail/pacman-dev/2007-June/008499.html

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-06-27 23:34:38 -04:00
Andrew Fyfe
1e56e41d63 scripts/makepkg.in: Use bsdtar to find packages for xdelta.
When looking for old packages to create a delta from used bsdtar to read the
packages .PKGINFO to check it's name and arch instead of depending on the
filename of th package.

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-06-27 20:35:09 -04:00
Chantry Xavier
269022ccae scripts/makepkg.in: Fix creation of .FILELIST
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-06-27 20:35:09 -04:00
Baptiste Daroussin
24c41f5190 FS7485: Replace tar/cpio/unzip with bsdtar for extracting/creating packages.
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-06-27 20:35:08 -04:00
Chantry Xavier
a486fec3c4 FS7338: Fix conflicts typo totally this time.
The last typo fix for conflicts wasn't complete,
it only fixed one occurence of the conflicts variable, instead of the two :
http://www.archlinux.org/pipermail/pacman-dev/2007-May/008222.html

This caused all conflicts statement to be ignored, so all databases
will need to be rebuilt with a fixed repo-add.

Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
2007-06-17 18:57:15 +02:00
Andrew Fyfe
7bd4486ebd scripts/makepkg.in: Forgot the fakeroot switch when changing to GNU getopt.
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-06-13 09:32:09 -04:00
Andrew Fyfe
83245aa58e scripts/makepkg.in: Added fakeroot version to .PKGINFO header.
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-06-12 23:30:56 +01:00
Andrew Fyfe
54b71f0427 scripts/makepkg.in: Switch to GNU getopt.
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-06-12 21:54:39 +01:00
Andreas Hauser
c1b6a6d616 FS7355: Add --ignorearch option to makepkg
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-06-11 07:53:30 -04:00
Roman Kyrylych
430a19c604 makepkg: Make it possible to create an empty package
Signed-off-by: Roman Kyrylych <roman@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-06-09 12:26:43 -04:00
Andrew Fyfe
e0afe6e94a Autotool clean up.
* Add vim modeline to Makefile.am and configure.ac
	* Fix white space in Makefile.am and configure.ac
	* Add contrib/wget-xdelta.sh to EXTRA_DIST in Makefile.am

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-06-04 22:24:29 -04:00
Andrew Fyfe
f32292367a scripts/makepkg.in: Add gettext translation for WARNING and ERROR.
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-06-04 22:01:26 -04:00
Andrew Fyfe
b757cc9414 scripts/makepkg.in: Fix version comparision in create_xdelta().
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-06-04 22:00:35 -04:00
Andrew Fyfe
241832853c scripts/abs.in: Rearrange/Cleanup.
* Rearrange the script.
        * Add gettext support.
        * Clean up usage message.

        * Add PACKAGE_BUGREPORT to substitution in scripts/Makefile.am

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-06-04 21:59:17 -04:00
Dan McGee
1698022bea Fix pacman-optimize autoconf paths
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-06-04 17:35:31 -04:00
Giovanni Scafora
ecb594107e Add gettext/i18n to most of the currently-used scripts
Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-06-04 16:54:25 -04:00
Dan McGee
d0679da4f3 makeworld: var rename from version -> myver
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-06-04 16:54:25 -04:00
Andrew Fyfe
c6c60bcc80 scripts/makepkg.in: More clean up.
* Add ChangeLog to source package.
	* Quote references to $BUILDSCRIPT.
	* Check $srcdir isn't empty when running --noextract.
	* Check $pkgdir isn't empty when running --repackage.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-06-03 22:21:06 -04:00
Andrew Fyfe
b69edc1c35 scripts/makepkg.in: Improve error handling and clean up on exit.
* makepkg now runs with errexit (exit on syntax error) enabled
	  for the whole script.
	* Removed unneeded setting of errexit around build().
	* Added bash traps to catch TERM HUP INT signals.
	* Added trap to catch unhandled/unknown errors.
	* Added trap to call clean_up() when the script exits.
	* Moved call to remove_deps() into clean_up().
	* Moved -c/--clean code into clean_up().

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-06-03 22:19:52 -04:00
Andrew Fyfe
76fd85450e Clean up output messages for translation.
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-06-03 22:19:52 -04:00
Andrew Fyfe
2fb2613ec1 scripts/makepkg.in: Rewrite check_{options,buildenv} to tidy them up.
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-06-03 22:19:51 -04:00
Andrew Fyfe
3b1e67628e scripts/makepkg.in: Clean up.
* Move create_xdelta() outside of fakeroot run.
	* Clean up dep check functions.
	* Clean up extract_sources().

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-06-03 22:19:51 -04:00
Dan McGee
214f264bd0 Rename functions in makepkg for consistency
Add a hyphen to any function name that needs it so we are consistent across
the board.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-06-02 13:44:54 -04:00
Ash Milsted
111c0f71c3 makepkg: fix create_xdelta() and add warning
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-06-02 13:44:54 -04:00
Andrew Fyfe
40af40da4c scripts/makepkg.in: Some more clean ups.
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-06-02 13:44:54 -04:00
Dan McGee
9883c157f9 makepkg: code cleanup
* Collapse some if statements (Andrew Fyfe)
* Add some E_ exit designations

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-06-02 13:44:54 -04:00
Andrew Fyfe
e19d7da4f9 scripts/makepkg.in: Move the remaining stages into functions.
* Move download code to download_sources()
  * Move checksum generation code to generate_checksums()
  * Move checksum check code to check_checksums()
  * Move extract source code to extract_sources()

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-06-02 13:44:54 -04:00
Andrew Fyfe
afd2adf1f3 scripts/makepkg.in: All calls to eval_gettext have been remove, gettext.sh is no longer needed.
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-06-02 13:44:54 -04:00
Dan McGee
fb10e0c797 Drop --usesudo option and add some checks related to ASROOT
Drop the --usesudo option and use it by default if running as a non-root
user. Check the usage of the --asroot option and do not allow it to be used
as a normal user. A few other small fixes, including a typo in $confdir.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-06-01 13:43:41 -04:00
Andrew Fyfe
6f183cb984 scripts/makepkg.in: Clean up gen/check checksum code.
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-06-01 11:57:10 -04:00
Andrew Fyfe
7f153b729f scripts/makepkg.in: Various clean ups.
* etc/makepkg.conf.in: Add description for xdelta.
* doc/makepkg.conf.5: Add description for xdelta.
* scripts/makepkg.in: Various clean ups.

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-06-01 11:49:17 -04:00
Andrew Fyfe
85fbf528bb Cleaned up dependencies check functions in makepkg
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-06-01 11:43:31 -04:00
Andrew Fyfe
6d649473fa FS7319: Add option to disable the inclusion of abs script.
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-31 18:44:00 -04:00
Andrew Fyfe
e422b71a48 Add autotool substitution for SRCEXT.
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-31 14:30:41 -04:00
Dale Ogilvie
cad44221c8 Clean up variable usage in create_xdelta() and add a check for the xdelta program.
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-30 23:58:22 -05:00
Dale Ogilvie
a8c552d477 Add support for creating xdeltas in makepkg.
Add xdelta option to makepkg.conf

Added xfer script to contrib.

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-30 23:58:22 -05:00
Dag Odenhall
2ef1c8416f makepkg: do not retrieve sources if NOEXTRACT or REPKG set
Signed-off-by: Dag Odenhall <dag.odenhall@gmail.com>
Signed-off-by: Andrew Fyfe <Andrew Fyfe  andrew@neptune-one.net>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-31 00:07:12 -04:00
Dan McGee
90a307bfa3 makepkg: switch applicable $startdir/dir refs to new variable names
After introducing $pkgdir and $srcdir, we can switch some lookups to
these new variables.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-31 00:02:32 -04:00
Dag Odenhall
92a14eab59 Check if pkgdir exists in create_package
Signed-off-by: Dag Odenhall <dag.odenhall@gmail.com>
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-30 23:52:22 -04:00
Dag Odenhall
6b776c82e7 makepkg: fix double occurance of word in asroot warning
Signed-off-by: Dag Odenhall <dag.odenhall@gmail.com>
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-30 23:42:23 -04:00
Dan McGee
b3535db2aa makepkg: add srcdir and pkgdir variables
We already have $startdir, so this introduces two more shorthand variables
for the most commonly accessed directories.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-30 14:32:04 -04:00
Dan McGee
f4d6efeee0 makepkg: add source package creation option
Add a new --source flag that allows creation of a source-only package.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-30 14:27:13 -04:00
Dan McGee
b6387b954f scripts: do autoconf path replacement right
This should finally get the path replacement in our scripts right. This
is the way the autoconf package itself does it and should not need much
further tweaking.

Threw in a few trailing whitespace corrections from the scripts as well.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-30 11:04:49 -04:00
Andrew Fyfe
5c41d0eb4c Substitute config directory in scripts.
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-29 17:49:24 -04:00
Dan McGee
f3836ff8e8 Set paths in pacman-optimize to use configure-time paths
By setting up a few more AC_SUBST macros in configure.ac, we can fill in
paths in the scripts on the fly instead of having them in multiple places.

Other small fixes:
* Fix an oops on my last commit where I had some lines stil commented.
* Fix makepkg bug where the generated package name using PKGEXT had two
  periods (..).

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-29 17:46:20 -04:00
Dan McGee
103c7243a2 Get --help and --version options working on all scripts
Added the autoconf option std-options to the scripts/ directory, which
checks to ensure all programs have both --help and --version options. A
few things needed cleaning up to get this working. To test these types
of options, use the 'make distcheck' target.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-29 16:53:15 -04:00
Andrew Fyfe
124693af37 Switch to printf for output messages.
Using printf we can avoid haveing to use eval_gettext and the ugly escape sequances required to use it.

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-28 20:27:18 +01:00
Dan McGee
7e98eac309 Add autotool-generated scripts to .gitignore
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-27 17:23:40 -04:00
Andrew Fyfe
26c32b017e Remove extra_dist from scripts/Makefile.am
This is automaticly done by autoconf.

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-27 17:16:28 -04:00
Andrew Fyfe
94aa9aff13 Fixed typo in scripts/repo-remove.in
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-27 17:16:28 -04:00
Andrew Fyfe
71026af678 chmod -x scripts/*.in
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-27 17:16:28 -04:00
Andrew Fyfe
e9e19b7cc6 autotool scripts/updatesync
- move scripts/updatesync -> scripts/updatesync.in
	- add -V --version options to scripts/updatesync.in
	- add autotool commands to generate scripts/updatesync

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-27 17:16:28 -04:00
Andrew Fyfe
48946b624b autotool scripts/repo-remove
- move scripts/repo-remove -> scripts/repo-remove.in
	- add -V --version options to scripts/repo-remove.in
	- add autotool commands to generate scripts/repo-remove

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-27 17:16:27 -04:00
Andrew Fyfe
49eddd3feb Added copyright header to scripts/abs.in
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-27 17:16:27 -04:00
Andrew Fyfe
f6b0869ee5 autotool scripts/repo-add
- move scripts/repo-add -> scripts/repo-add.in
	- add -V --version options to scripts/repo-add.in
	- add autotool commands to generate scripts/repo-add

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-27 17:16:27 -04:00
Andrew Fyfe
a73e9a24af move parameter count check after check for help and version.
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-27 17:16:27 -04:00
Andrew Fyfe
95720106bb autotool scripts/pacman-optimize
- move scripts/pacman-optimize -> scripts/pacman-optimize.in
	- add -V --version options to scripts/pacman-optimize.in
	- add autotool commands to generate scripts/pacman-optimize

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-27 17:16:27 -04:00
Andrew Fyfe
ab53ee1e7c autotool scripts/makeworld
- move scripts/makeworld to scripts/makeworld.in
	- add -V --version options to scripts/makeworld.in
	- add autotool commands to generate scripts/makeworld

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-27 17:16:27 -04:00
Andrew Fyfe
a2d018a954 autotool scripts/gensync
- move scripts/gensync -> scripts/gensync.in
	- add -V --version options to scripts/gensync.in
	- add autotool commands to generate scripts/gensync

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-27 17:16:27 -04:00
Andrew Fyfe
2b6bc5bcda autotool scripts/abs
- move scripts/abs -> scripts/abs.in
	- add -V --version options to scripts/abs.in
	- add autotool commands to generate scripts/abs

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-27 17:16:27 -04:00
Andrew Fyfe
c3876845b2 fix existing autotools in scripts/*
- Remove scripts/makepkg on 'make distclean'
	- scripts/makepkg.in: set myver on ./configure

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-27 17:16:27 -04:00
Dan McGee
aedff1c117 makepkg: fakeroot-related changes and other misc output
A few changes to undo my stupid mistake earlier wrt fakeroot checking,
and unify the output and usage of 'makepkg.conf'.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-27 17:01:49 -04:00
Andrew Fyfe
bc6ce2a190 Removed fakeroot hacks.
Removed fakeroot hacks from
	* handledeps()
	* removedeps()
	* installpackage()

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-27 16:10:24 -04:00
Andrew Fyfe
9ff52db3db Reduced the number of commands run inside fakeroot to the bare minimum.
Only the following functions now run inside fakeroot
	* run_build()
	* tidy_install()
	* create_package()

Added check for inproper use of '-F' option.

Added warning if makepkg is run as root. Added a new '--asroot' flag that
must be passed if you wish to run makepkg as the root user.

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-27 16:06:50 -04:00
Dan McGee
c88037203b makepkg: ensure DISTCC_HOSTS variable is exported when required
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-16 13:18:19 -04:00
Dan McGee
53f2dcaa3a makepkg: a few small changes
* change "Tidying Install" message to msg instead of msg2
* Fix quoting issues in usage output
* Remove LANG and friends unsetting- this should be done in the offending
  package builds
* Check for defined $BUILDSCRIPT, since it was moved to makepkg.conf

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-14 11:55:19 -04:00
Andrew Fyfe
93b6e35bcb Cleaned up and simplified run_build().
Restore LC_ALL and LANG after running build().

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-14 11:05:58 -04:00
Andrew Fyfe
eda7e5fcdf Moved commands to setup build environment and run build() into run_build().
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-14 11:05:58 -04:00
Andrew Fyfe
9b85864e37 Cleaned up and simplified tidy_install().
Added 'LC_ALL= LANG=' to find commands for stripping symbols from binaries/libraries.
This stops the greps failing if LC_ALL or LANG != en_US|C|POSIX.

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-14 11:05:58 -04:00
Andrew Fyfe
e2f42947e3 Moved commands to tidy up package install into tidy_install().
The following sets of commands were moved into tidy_install()
	* Remove info/doc files.
	* Move usr/share/man to usr/man
	* Compress man pages.
	* Strip debug symbols from binaries/libraries.
	* Remove libtool *.la files.
	* Remove empty directories.

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-14 11:05:58 -04:00
Andrew Fyfe
7fb1dc3f20 Cleaned up and simplified create_package().
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-14 11:05:58 -04:00
Andrew Fyfe
5b4a4af94d Moved commands to create package file into create_package().
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
2007-05-14 11:05:58 -04:00
Dan McGee
01bc7d7749 repo-add: fix conflicts instead of conflict bug
makepkg generates PKGINFO files with "conflict = ", repo-add was
incorrectly looking for "conflicts = ".

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-06 18:55:26 -04:00
Dan McGee
96f35d219c Allow repo-add to work with symlinks (fixes FS #7054)
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-05-06 18:50:41 -04:00
Marcus Habernehl
339caa61ef repo-add: Fix bug where desc info was omitted if package in a group
This fixes FS #7005.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-04-25 11:05:53 -04:00
Scott Horowitz
d1c3bd62de rankmirrors: download first 50KB of DB to get more reliable numbers
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-04-23 00:30:45 -04:00
Alexander Baldeck
a34dc1d4ef Bug fix for FS#6944
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2007-04-17 23:52:59 -05:00
Dan McGee
7f183d29ac makepkg: unset LC_MESSAGES during builds
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-04-16 23:58:07 -04:00
Andrew Fyfe
721ceee1e2 makepkg: remove grep calls from stripping binaries
Remove grep calls from stripping binaries and libraries, which will
not work with localized strings. Clean up the find usage as well.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-04-16 22:12:15 -04:00
Dan McGee
8bd0f3921f Forward port 3.0.2 branch fixes
Fix #6905- makepkg dependency checking error
Fix #6915- add SUU mirror to mirrorlist.in

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-04-16 21:51:18 -04:00
Dan McGee
dde2f3eefa Fix FS #6872- CFLAGS are not used
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-04-11 12:44:42 -04:00
Roman Kyrylych
4dc5dfc72a makepkg: spelling fix
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-04-05 11:36:38 -04:00
Dan McGee
df290b499a Enable support for other download protocols in makepkg
This patch fixes FS #4404 as well as adding support for future protocols by
generalizing the concept of a download agent and allowing a downloader to
be specified for each protocol.

Original work done by Andrew Fyfe <andrew@neptune-one.net>.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-04-04 22:58:47 -04:00
Aaron Griffin
76f816b9f7 Backport changes from 3.0.1
* Align makepkg -g checksums (Tom Killian <tom@archlinux.org>)
* Use additional case-sensitive string compare to defeat locale issues (tr_TR)
* Added Russian mirror
* Fix a -R failure when trying to remove the same target twice
* Bump configure.ac version to 3.0.1

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2007-04-04 00:30:14 -05:00
Andrew Fyfe
9c9e18ef32 Tidy up usage of makepkg.conf
Moved the following variables into /etc/makepkg.conf
	* BUILDSCRIPT
	* PKGEXT
	* DB_COMPRESSION
	* DB_CHECKSUMS

Cleaned up sourcing of /etc/makepkg.conf in scripts and source
~/.makepkg.conf if it exists.

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-04-01 21:52:28 -04:00
Giovanni Scafora
f044e23a60 Gettext support in makepkg
Add gettext support to makepkg. Still to do- figure out for sure what
textdomain the translations should go in (perhaps share with pacman?), and
ensure this doesn't break anything.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-03-31 20:30:35 -04:00
Dan McGee
583b4b10a3 Move makepkg -> makepkg.in in anticaption of gettextized version
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-03-31 20:30:35 -04:00
Aaron Griffin
970d2e942e repo-add leaves .PKGINFO in the current directory
* Misuse of 'tar xf', which should be 'tar tf'

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2007-03-29 21:30:40 -05:00
Aaron Griffin
9a9f1e00da From: Andrew Fyfe <andrew@neptune-one.net>
Date: Thu, 29 Mar 2007 11:11:36 +0100
Subject: [PATCH 1/1] Fix bug where makepkg can't extract .tar.Z archives.

For some reason 'tar -xf' doesn't work with .tar.Z, you need to use
'tar -xzf' to extract the archive.

Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2007-03-29 21:26:58 -05:00
Dan McGee
462ad153e7 Add execute permissions to abs and rankmirrors
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-03-28 18:41:29 -04:00
Dan McGee
8cacc46f8b Move .cvsignore -> .gitignore
* Move all .cvsignore files to .gitignore for switch in VCS. In addition,
  delete ones that were unnecessary because they only contained Makefile
  and Makefile.am.

Signed-off-by: Dan McGee <dan@archlinux.org>
2007-03-27 21:06:31 -04:00
Dan McGee
58fe79eef6 * Fix bug where 'makepkg -L' doesn't stop on build failure.
Andrew Fyfe <andrew@neptune-one.net>
* Add testing to etc/pacman.d/.cvsignore
* Fix scriptlet001.py test to work during 'make check'.
2007-03-25 17:37:42 +00:00
Dan McGee
a07b490344 Andrew Fyfe <andrew@neptune-one.net>
* Fix FS #6688- builddeps not working in makepkg.
2007-03-24 17:11:18 +00:00
Dan McGee
8ded2051d2 * TODO.dan updates.
Alessio 'mOLOk' Bolognino <themolok.ml@gmail.com>
* Make makeworld compatable with makepkg lacking -w option.
2007-03-20 19:16:17 +00:00
Dan McGee
0fa7d47a4d * makepkg: a few more changes to get dependencies working correctly. If a
user does not install all required dependencies, makepkg will now bail.
2007-03-20 02:13:44 +00:00
Dan McGee
b882f463df * makepkg: Fix behavior of -Ssr: deps were not being correctly removed before. 2007-03-20 01:34:16 +00:00
Dan McGee
62d0a00511 * makepkg: fix installation of dependencies with version comparitors. 2007-03-19 22:48:54 +00:00
Dan McGee
bd7b7e5f0c * Added quoting on several makepkg paths that were lacking it. 2007-03-18 23:09:50 +00:00
Dan McGee
4bfd0cb6cc * Missing a 'msg' in makepkg- pointed out by wain on Flyspray. Thanks! 2007-03-14 23:25:03 +00:00
Aaron Griffin
2020e0ec73 * Sebastian Sareyko
Fix repo-add filename addition (use basename)
2007-03-13 15:01:15 +00:00
Dan McGee
ba1806f5ac * Removed ${CFLAGS} from Makefile.am(s) as it was causing all CFLAGS to be
duplicated.
* Updated the util Makefile.am to link with the proper libalpm.la.
* Fixed bitmasking issues in be_files.c and db.h.
* Rankmirrors updates from James Rosten (with some cleaning up of my own).
  KeyboardInterrupts are now handled gracefully.
2007-03-12 03:02:57 +00:00
Dan McGee
68876e4eb0 * Another slight update, getting rid of -rf flags and clarifying a message. 2007-03-09 05:11:47 +00:00
Dan McGee
0a1ca73183 * Added confirmation step to makepkg -C operation to ensure user is deleting
exactly what they think they are.
2007-03-09 04:35:04 +00:00
Dan McGee
4770ac784e * rankmirrors updates from Scott Horowitz <stonecrest@gmail.com>.
Formatted output is now the default. Added a TODO for later as well.
2007-03-05 02:32:14 +00:00