- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/2] dirent usage cleanup
by Dan McGee 17 Nov '10

17 Nov '10

We were including the header in a lot of places it is no longer used. Additionally, use the correct autoconf macro for determining whether d_type is available as a member: HAVE_STRUCT_DIRENT_D_TYPE. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- configure.ac | 1 + lib/libalpm/be_local.c | 2 +- lib/libalpm/be_sync.c | 1 - lib/libalpm/db.c | 1 - lib/libalpm/sync.c | 1 - src/pacman/callback.c | 1 - 6 files changed, 2 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 6f601f4..e8541d2 100644 --- a/configure.ac +++ b/configure.ac @@ -179,6 +179,7 @@ AC_TYPE_PID_T AC_TYPE_SIZE_T AC_STRUCT_TM AC_TYPE_UID_T +AC_STRUCT_DIRENT_D_TYPE # Checks for library functions. AC_FUNC_FORK diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 2212752..988248d 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -340,7 +340,7 @@ static int checkdbdir(pmdb_t *db) static int is_dir(const char *path, struct dirent *entry) { -#ifdef DT_DIR +#ifdef HAVE_STRUCT_DIRENT_D_TYPE return(entry->d_type == DT_DIR); #else char buffer[PATH_MAX]; diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index e1c7663..bec6abe 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -21,7 +21,6 @@ #include "config.h" #include <errno.h> -#include <dirent.h> #include <ctype.h> #include <locale.h> diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 79d20d4..1e7d3a2 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -29,7 +29,6 @@ #include <errno.h> #include <string.h> #include <sys/stat.h> -#include <dirent.h> #include <regex.h> #include <time.h> diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 1e73b8b..2fd79ea 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -31,7 +31,6 @@ #include <stdint.h> /* intmax_t */ #include <unistd.h> #include <time.h> -#include <dirent.h> /* libalpm */ #include "sync.h" diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 32dafb5..925f1fc 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -26,7 +26,6 @@ #include <sys/time.h> #include <sys/types.h> /* off_t */ #include <unistd.h> -#include <dirent.h> #include <wchar.h> #include <alpm.h> -- 1.7.3.2

1 1

[pacman-dev] Checking free space before transaction
by Allan McRae 14 Nov '10

14 Nov '10

Hi, I have implemented some basic disk space checking in pacman. The code is still a bit rough and there are some TODOs in there (especially related to output). But the basics are all there, so it seems time to get some comments. See my diskspace branch: http://projects.archlinux.org/users/allan/pacman.git/log/?h=diskspace Obviously I need to do some rebasing there, so it is probably easiest to look at the diff between that and my working branch: http://projects.archlinux.org/users/allan/pacman.git/diff/?h=diskspace&id2=… Here are some basic examples of what is implemented so far: > sudo src/pacman/pacman -S grub --dbpath /home/allan/tmp/db/ ... (1/1) checking for file conflicts [######################] 100% Partition: / - blocks needed: 112 - blocks free: 2635828 Partition: /boot - blocks needed: 1 - blocks free: 109046 (1/1) installing grub [######################] 100% > sudo src/pacman/pacman -S grub --dbpath /home/allan/tmp/db/ ... (1/1) checking for file conflicts [######################] 100% Partition: / - blocks needed: 0 - blocks free: 2635684 Partition: /boot - blocks needed: 0 - blocks free: 109044 (1/1) upgrading grub [######################] 100% It also handles the space freed by removing conflicts etc. Obviously the space calculations could be improved, e.g. - for /boot on installing grub, the /boot/grub directory should require a block in addition to the one used by the menu.lst file - directories get counted for removal even when they are not being removed... and that multiplies across packages - .PKGINFO etc count towards / (rather than to dbpath ???) - space for .pacnew/.pacsave files is ignored But it is close enough... In its current form the calculations should catch major stupidity. Allan

4 27

[pacman-dev] Versioned packages on the command line.
by Xyne 11 Nov '10

11 Nov '10

Hi, If two repos (obviously not both official) provide the same binary package, pacman will install the package from the repo that is listed first in pacman.conf, if specified on the command line, e.g. "pacman -S foo". If another package depends on "foo", the same thing happens, but if it instead depends on "foo=1.4" and only the second repo provides it, then pacman will correctly skip over the first repo and install it from the second. If so, would you consider making it possible to specify versions directly on the command line, e.g. "pacman -S foo=1.4". I know that it's possible to first do a search for the package to see which repos contain it, then prepend the repo, e.g. "pacman -S second-repo/foo", but it would be more useful sometimes to be able to just specify the version using "=", "<=", etc. This would ideally also work for detecting providers too, e.g. if "bar" provides "foo=1.4" then "pacman -S foo=1.4" would install bar (or bring up the provider selection dialogue once that's included... I really like that idea btw... considered doing that in powerpill at some point) For a possible use of this, see the following post on the arch-haskell mailing list: http://www.haskell.org/pipermail/arch-haskell/2010-November/000740.html Regards, Xyne

2 2

[pacman-dev] pkgsum - Checksum package files against installed files
by Andre "Osku" Schmidt 08 Nov '10

08 Nov '10

Hello, once upon a time someone at #archlinux did `make install` and i wanted to know if it overwrote any system files (cause it was not /usr/local he used). so i hacked this little script to checksum files in package against installed files. and today someone even wanted this kind of tool at the channel, and lastly allanmademeposthere :P Usage: pkgsum <packagename> it also reads a lazy VERBOSE variable: 0 (default) = print only results 1 = print also not matching checksums 2 = print also all files if anyone finds bugs, improvements, etc. please fix it! :P cheers .andre ps. i dont think that pkgsum fits as name 100% but for now its sufficient enough for me (tm)

4 6

[pacman-dev] Which BSD?
by Allan McRae 08 Nov '10

08 Nov '10

Hi, Can the people who run pacman on some flavor of BSD let me know what type you use? I would like to install a relevant version in a VM to test out some changes to pacman. Allan

2 1

[pacman-dev] [PATCH] Support reading package args from stdin
by Dave Reisner 05 Nov '10

05 Nov '10

Only occurs if no arguments were provided directly. Arguments can be separated by any amount of valid whitespace. This allows for piping into pacman from other programs or from itself, e.g.: pacman -Qdtq | pacman -Rs This is better than using xargs, as xargs will not reconnect stdin to the terminal. The above operation performed using xargs would require the --noconfirm flag to be passed to pacman. Signed-off-by: Dave Reisner <d(a)falconindy.com> --- Additional cleanup at Dan's request, and added documentation to man page wrt to this feature. Woo, documentation. doc/pacman.8.txt | 5 +++++ src/pacman/pacman.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 4bdb3f9..418ddfc 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -25,6 +25,11 @@ Since version 3.0.0, pacman has been the frontend to linkman:libalpm[3], the ``Arch Linux Package Management'' library. This library allows alternative front ends to be written (for instance, a GUI front end). +Invoking pacman involves specifying an operation with any potential options +and targets to operate on. A 'target' is usually a package name, filename, URL, +or a search string. Targets can be provided as arguments to pacman and/or +passed through standard input. + Operations ---------- diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 15abecc..39390a5 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -26,6 +26,7 @@ #define PACKAGE_VERSION GIT_VERSION #endif +#include <ctype.h> /* isspace */ #include <stdlib.h> /* atoi */ #include <stdio.h> #include <limits.h> @@ -1305,6 +1306,39 @@ int main(int argc, char *argv[]) cleanup(ret); } + /* we also support reading targets from stdin */ + if(!isatty(fileno(stdin))) { + char line[PATH_MAX]; + int i = 0; + while(i < PATH_MAX && (line[i] = fgetc(stdin)) != EOF) { + if(isspace((unsigned char)line[i])) { + /* avoid adding zero length arg when multiple spaces separate args */ + if(i > 0) { + line[i] = '\0'; + pm_targets = alpm_list_add(pm_targets, strdup(line)); + i = 0; + } + } else { + i++; + } + } + /* check for buffer overflow */ + if (i >= PATH_MAX) { + pm_printf(PM_LOG_ERROR, _("buffer overflow detected in arg parsing\n")); + cleanup(EXIT_FAILURE); + } + + /* end of stream -- check for data still in line buffer */ + if(i > 0) { + line[i] = '\0'; + pm_targets = alpm_list_add(pm_targets, strdup(line)); + } + if (!freopen(ctermid(NULL), "r", stdin)) { + pm_printf(PM_LOG_ERROR, _("failed to reopen stdin for reading: (%s)\n"), + strerror(errno)); + } + } + /* parse the config file */ ret = parseconfig(config->configfile); if(ret != 0) { -- 1.7.3.2

2 1

[pacman-dev] [RFC] New member selection when installing group
by Xavier Chantry 05 Nov '10

05 Nov '10

One part of what's on http://code.toofishes.net/cgit/xavier/pacman.git/log/?h=working is about proposing a new interactive selection for installing groups. I did not like the old one, because I don't want to answer 50 questions when I install one group with 50 members. This is ugly, and the selection is not easily reproducible, for example you cannot easily copy/paste the answers of one run to another. I think a text frontend really sucks for this kind of workflow, a graphical or at least ncurses frontend would do much better. But my new provision selection inspired to both Jakob and Dan that we could have the same for groups, so I went ahead and implemented it over the weekend. $ pacman -S base-devel :: There are 11 members in group base-devel: :: Repository testing 1) make :: Repository core 2) autoconf 3) automake 4) bison 5) fakeroot 6) flex 7) gcc 8) libtool 9) m4 10) patch 11) pkg-config Which ones do you want to install? Enter a number (default=all): Multiple choices are possible, separated by spaces. Either single number or a range a-b. Both single numbers and range can be negated with ^ prefix. Choices are applied successively, so each choice override previous ones (in case of conflict). If first choice is negative, all targets are implicitly selected, otherwise no target is implicitly selected. Examples : 1) 3 6 8 : install automake, flex and libtool 2) 2-11 : install all targets in core repo 3) ^1 or 1-11 ^1 : install everything but make (like 2)) 4) ^2-11 : install everything but targets 2-11, i.e. only testing/make is left No idea how practical / user-friendly it is, so feedback and testing welcome.

4 7

[pacman-dev] [PATCH] Support reading package args from stdin
by Dave Reisner 05 Nov '10

05 Nov '10

Only occurs if no arguments were provided directly. Arguments can be separated by any amount of valid whitespace. This allows for piping into pacman from other programs or from itself, e.g.: pacman -Qdtq | pacman -Rs This is better than using xargs, as xargs will not reconnect stdin to the terminal. The above operation performed using xargs would require the --noconfirm flag to be passed to pacman. Signed-off-by: Dave Reisner <d(a)falconindy.com> --- Resending as per Allan's request with modifications from the origin 7/24 submission. Changes: * Check return value of freopen * Assign '\0' instead of 0 to null terminate * Use post-increment instead of pre-increment * Check for buffer overflow condition (not convinced my method is reasonable) * Dynamically find stdin's FD instead of assuming it's 1 * Use PATH_MAX instead of BUFSIZ Concerns: * The verbiage I've used in the new strings is probably not ideal. src/pacman/pacman.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 15abecc..e078aab 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -26,6 +26,7 @@ #define PACKAGE_VERSION GIT_VERSION #endif +#include <ctype.h> /* isspace */ #include <stdlib.h> /* atoi */ #include <stdio.h> #include <limits.h> @@ -1305,6 +1306,38 @@ int main(int argc, char *argv[]) cleanup(ret); } + /* read package arguments from stdin if we have none yet */ + if(!pm_targets && !isatty(fileno(stdin))) { + char line[PATH_MAX]; + int i = 0; + while(i < PATH_MAX && (line[i] = fgetc(stdin)) != EOF) { + if(isspace((unsigned char)line[i])) { + line[i] = '\0'; + /* avoid adding zero length arg when multiple spaces separate args */ + if(i > 0) { + pm_targets = alpm_list_add(pm_targets, strdup(line)); + i = 0; + } + } else { + i++; + } + } + /* check for buffer overflow */ + if (i >= PATH_MAX) { + pm_printf(PM_LOG_ERROR, _("buffer overflow detected in arg parsing\n")); + cleanup(EXIT_FAILURE); + } + + /* end of stream -- check for data still in line buffer */ + if(i > 0) { + pm_targets = alpm_list_add(pm_targets, strdup(line)); + } + if (!freopen(ctermid(NULL), "r", stdin)) { + pm_printf(PM_LOG_ERROR, _("failed to reopen stdin for reading: (%s)\n"), + strerror(errno)); + } + } + /* parse the config file */ ret = parseconfig(config->configfile); if(ret != 0) { -- 1.7.3.2

2 1

[pacman-dev] [PATCH] Support reading package args from stdin
by Dave Reisner 04 Nov '10

04 Nov '10

Only occurs if no arguments were provided directly. Arguments can be separated by any amount of valid whitespace. This allows for piping into pacman from other programs or from itself, e.g.: pacman -Qdtq | pacman -Rs This is better than using xargs, as xargs will not reconnect stdin to the terminal. The above operation performed using xargs would require the --noconfirm flag to be passed to pacman. Revised from the original 7/24 submission at Allan's request to check the return value of freopen(). Signed-off-by: Dave Reisner <d(a)falconindy.com> --- src/pacman/pacman.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 15abecc..6f40a97 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -26,6 +26,7 @@ #define PACKAGE_VERSION GIT_VERSION #endif +#include <ctype.h> /* isspace */ #include <stdlib.h> /* atoi */ #include <stdio.h> #include <limits.h> @@ -1305,6 +1306,32 @@ int main(int argc, char *argv[]) cleanup(ret); } + /* read package arguments from stdin if we have none yet */ + if(!pm_targets && !isatty(0)) { + char line[BUFSIZ]; + int i = 0; + while((line[i] = fgetc(stdin)) != EOF) { + if(isspace(line[i])) { + line[i] = 0; + /* avoid adding zero length arg when multiple spaces separate args */ + if(i > 0) { + pm_targets = alpm_list_add(pm_targets, strdup(line)); + i = 0; + } + } else { + ++i; + } + } + /* end of stream -- check for data still in line buffer */ + if(i > 0) { + pm_targets = alpm_list_add(pm_targets, strdup(line)); + } + if (!freopen(ctermid(NULL), "r", stdin)) { + pm_printf(PM_LOG_ERROR, _("failed to reopen stdin for reading: (%s)\n"), + strerror(errno)); + } + } + /* parse the config file */ ret = parseconfig(config->configfile); if(ret != 0) { -- 1.7.3.2

3 6

[pacman-dev] [PATCH] Sync data after writing to the local db
by Allan McRae 31 Oct '10

31 Oct '10

This should hopefully reduce local db corruption issues. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_local.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 4574bd4..cb12abb 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -841,6 +841,7 @@ int _alpm_local_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) fprintf(fp, "\n"); } + fdatasync(fileno(fp)); fclose(fp); fp = NULL; } @@ -869,6 +870,8 @@ int _alpm_local_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) } fprintf(fp, "\n"); } + + fdatasync(fileno(fp)); fclose(fp); fp = NULL; } -- 1.7.3.2

4 4