- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.1-50-g9d1e808
by dan＠archlinux.org 31 Jan '12

31 Jan '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via 9d1e8084dfa0a1ebae6c37e3b839289cb905116f (commit) via 7b2f600d717ce5ecd0025d2fba43d405adb58bd4 (commit) via 5c2928aa259cac1dcdaa8b27172c2ee12327d21a (commit) via 9e9835f4640a45cc758fa64de5923d7f836fe1f4 (commit) via 7ff1b945f6c8b2286f04626be39291a7527119f4 (commit) from 825b4ff35aa676b139dc24bc651724b092f2fded (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9d1e8084dfa0a1ebae6c37e3b839289cb905116f Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jan 30 21:56:53 2012 -0600 Update translations Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7b2f600d717ce5ecd0025d2fba43d405adb58bd4 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jan 30 21:49:34 2012 -0600 Update pot translation catalogs Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5c2928aa259cac1dcdaa8b27172c2ee12327d21a Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jan 30 21:43:23 2012 -0600 Make a few more copyright date tweaks Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9e9835f4640a45cc758fa64de5923d7f836fe1f4 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Jan 23 17:14:25 2012 -0500 scripts: always use printf with embedded gettext This addresses two problems: 1) echo's behavior is inconsistent when dealing with flags, and can potentially be problematic. $ echo -n $ echo -- -n -- -n 2) Always using the end of options markers prevents translated strings from throwing errors, as shown in FS#28069. The remaining "inconsistencies" are because printf is being used in a guaranteed safe manner, e.g. printf '%s\n' "$(gettext "--this can never break")" Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7ff1b945f6c8b2286f04626be39291a7527119f4 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Jan 30 11:47:48 2012 +1000 makepkg: workaround for zipman issues This "fixes" two issues: 1) MAN_DIRS contains a glob by default so should not be quoted. It is not quoted anywhere else so this should not cause breakage... 2) the find statement returns 1 when some of MAN_DIRS are missing. This appears to only be exposed when running makepkg as root (which it appears some wrappers do...). Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/index.txt | 2 +- lib/libalpm/po/ru.po | 37 ++++--- scripts/makepkg.sh.in | 81 +++++++------- scripts/pacman-db-upgrade.sh.in | 8 +- scripts/pacman-key.sh.in | 50 +++++----- scripts/pacman-optimize.sh.in | 12 +- scripts/pkgdelta.sh.in | 8 +- scripts/po/ca.po | 96 ++++++++++++++--- scripts/po/cs.po | 96 ++++++++++++++--- scripts/po/da.po | 90 +++++++++++++---- scripts/po/de.po | 97 ++++++++++++++--- scripts/po/el.po | 102 ++++++++++++++---- scripts/po/en_GB.po | 94 ++++++++++++----- scripts/po/es.po | 96 ++++++++++++++--- scripts/po/fi.po | 95 ++++++++++++++--- scripts/po/fr.po | 107 +++++++++++++++---- scripts/po/hu.po | 110 +++++++++++++++----- scripts/po/it.po | 96 ++++++++++++++--- scripts/po/kk.po | 97 ++++++++++++++---- scripts/po/lt.po | 96 ++++++++++++++--- scripts/po/nb.po | 100 ++++++++++++++---- scripts/po/pacman-scripts.pot | 72 ++++++++++--- scripts/po/pl.po | 94 +++++++++++++--- scripts/po/pt.po | 98 ++++++++++++++---- scripts/po/pt_BR.po | 100 ++++++++++++++---- scripts/po/ro.po | 98 ++++++++++++++---- scripts/po/ru.po | 222 ++++++++++++++++++++++++++++----------- scripts/po/sk.po | 159 +++++++++++++++++++++------- scripts/po/sr.po | 96 ++++++++++++++--- scripts/po/sr(a)latin.po | 96 ++++++++++++++--- scripts/po/sv.po | 90 +++++++++++++---- scripts/po/tr.po | 98 ++++++++++++++---- scripts/po/uk.po | 96 ++++++++++++++--- scripts/po/zh_CN.po | 96 ++++++++++++++--- scripts/po/zh_TW.po | 76 +++++++++++--- scripts/repo-add.sh.in | 44 ++++---- src/pacman/po/ca.po | 6 +- src/pacman/po/cs.po | 6 +- src/pacman/po/da.po | 6 +- src/pacman/po/de.po | 6 +- src/pacman/po/el.po | 6 +- src/pacman/po/en_GB.po | 6 +- src/pacman/po/es.po | 6 +- src/pacman/po/fi.po | 6 +- src/pacman/po/fr.po | 6 +- src/pacman/po/hu.po | 10 +-- src/pacman/po/it.po | 6 +- src/pacman/po/kk.po | 6 +- src/pacman/po/lt.po | 6 +- src/pacman/po/nb.po | 6 +- src/pacman/po/pacman.pot | 6 +- src/pacman/po/pl.po | 6 +- src/pacman/po/pt.po | 6 +- src/pacman/po/pt_BR.po | 6 +- src/pacman/po/ro.po | 6 +- src/pacman/po/ru.po | 139 +++++++++++++------------ src/pacman/po/sk.po | 6 +- src/pacman/po/sr.po | 6 +- src/pacman/po/sr(a)latin.po | 6 +- src/pacman/po/sv.po | 6 +- src/pacman/po/tr.po | 16 +-- src/pacman/po/uk.po | 33 +++---- src/pacman/po/zh_CN.po | 6 +- src/pacman/po/zh_TW.po | 6 +- 64 files changed, 2509 insertions(+), 938 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: workaround for zipman issues
by Allan McRae 30 Jan '12

30 Jan '12

This "fixes" two issues: 1) MAN_DIRS contains a glob by default so should not be quoted. It is not quoted anywhere else so this should not cause extra breakage... 2) the find statement returns 1 when some of MAN_DIRS are missing. This appears to only be exposed when running makepkg as root (which it appears some wrappers do...). Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This is for maint. Both "fixes" are crappy but addressing them properly will require much larger changes that are not suitable for the 4.0.2 release. scripts/makepkg.sh.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index f269fc0..fee6512 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1003,7 +1003,8 @@ tidy_install() { # the '|| true' part keeps the script from bailing on the EOF returned # by read at the end of the find output IFS=$'\n' read -rd '' -a hardlinks < \ - <(find "${MAN_DIRS[@]}" \! -name "$file" -samefile "$manpage" 2>/dev/null) || true + <(find ${MAN_DIRS[@]} \! -name "$file" -samefile "$manpage" \ + 2>/dev/null || true) || true rm -f "${hardlinks[@]}" # compress the original gzip -9 "$manpage" -- 1.7.9

1 0

Re: [pacman-dev] [aur-general] makepkg/yaourt issues
by Allan McRae 25 Jan '12

25 Jan '12

On 25/01/12 09:45, masutu wrote: > (i) zipman option in "/etc/makepkg.conf" > > if zipman is enabled in "/etc/makepkg.conf", makepkg gives errors like > > [...] > ==> Tidying install... > -> Purging unwanted files... > -> Compressing man and info pages... > ==> ERROR: An unknown error has occurred. Exiting... > [...] > > when running as root (yaourt/makepkg). Surprisingly man pages do get > gzipped and work correctly, so no real problem, just wondering. When > running makepkg as normal user, this error message doesn't occur. Similar > issue is discussed in https://bbs.archlinux.org/viewtopic.php?pid=1046860. > I can replicate this issue only when running makepkg as root... So why does this line fail when running as root but not as a user: IFS=$'\n' read -rd '' -a hardlinks < \ <(find "${MAN_DIRS[@]}" \! -name "$file" -samefile "$manpage" 2>/dev/null) || true It is the find line that is causing this issue due to non-existent directories in MAN_DIRS. We used to have a "|| true" after the actual find command to stop that but it got removed when switching to using "read". Allan

1 0

[pacman-dev] [PATCH 1/2] add library support for tuning TCP_KEEPALIVE
by Dave Reisner 24 Jan '12

24 Jan '12

This adds three new options to control the behavior of TCP keepalives: - CURLOPT_TCP_KEEPALIVE: enable/disable probes - CURLOPT_TCP_KEEPIDLE: idle time before sending first probe - CURLOPT_TCP_KEEPINTVL: delay between successive probes While not all operating systems support the TCP_KEEPIDLE and TCP_KEEPINTVL knobs, the library will still allow these options to be set by clients, silently ignoring the values. --- Playing the role of the optimist and labelling this work for 7.24.1. This is mostly the result of a conversation I had with Daniel regarding usage of keepalives to thwart control connections to FTP servers being killed off by firewalls. The code is more or less copied from the front end tool, with all the bells and whistles added to wire it up for accessibility via curl_easy_setopt. docs/libcurl/curl_easy_setopt.3 | 18 ++++++++++++++++++ docs/libcurl/symbols-in-versions | 3 +++ include/curl/curl.h | 7 +++++++ lib/connect.c | 32 ++++++++++++++++++++++++++++++++ lib/url.c | 20 ++++++++++++++++++++ lib/urldata.h | 4 ++++ 6 files changed, 84 insertions(+), 0 deletions(-) diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3 index 1a20cb9..0a4fef3 100644 --- a/docs/libcurl/curl_easy_setopt.3 +++ b/docs/libcurl/curl_easy_setopt.3 @@ -915,6 +915,24 @@ overdone. .IP CURLOPT_ADDRESS_SCOPE Pass a long specifying the scope_id value to use when connecting to IPv6 link-local or site-local addresses. (Added in 7.19.0) + +.IP CURLOPT_TCP_KEEPALIVE +Pass a long. If set to 1, TCP keepalive probes will be sent. The delay and +frequency of these probes can be controlled by the \fICURLOPT_TCP_KEEPIDLE\fP +and \fICURLOPT_TCP_KEEPINTVL\fP options, provided the operating system supports +them. Set to 0 (default behavior) to disable keepalive probes (Added in +7.24.1). + +.IP CURLOPT_TCP_KEEPIDLE +Pass a long. Sets the delay, in seconds, that the operating system will wait +while the connection is idle before sending keepalive probes. Not all operating +systems support this option. (Added in 7.24.1) + +.IP CURLOPT_TCP_KEEPINTVL +Pass a long. Sets the interval, in seconds, that the operating system will wait +between sending keepalive probes. Not all operating systems support this +option. (Added in 7.24.1) + .SH NAMES and PASSWORDS OPTIONS (Authentication) .IP CURLOPT_NETRC This parameter controls the preference of libcurl between using user names and diff --git a/docs/libcurl/symbols-in-versions b/docs/libcurl/symbols-in-versions index 73d50a2..a9f8a9d 100644 --- a/docs/libcurl/symbols-in-versions +++ b/docs/libcurl/symbols-in-versions @@ -486,6 +486,9 @@ CURLOPT_SSL_SESSIONID_CACHE 7.16.0 CURLOPT_SSL_VERIFYHOST 7.8.1 CURLOPT_SSL_VERIFYPEER 7.4.2 CURLOPT_STDERR 7.1 +CURLOPT_TCP_KEEPALIVE 7.24.1 +CURLOPT_TCP_KEEPIDLE 7.24.1 +CURLOPT_TCP_KEEPINTVL 7.24.1 CURLOPT_TCP_NODELAY 7.11.2 CURLOPT_TELNETOPTIONS 7.7 CURLOPT_TFTP_BLKSIZE 7.19.4 diff --git a/include/curl/curl.h b/include/curl/curl.h index 59a5c79..2a9957e 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -1499,6 +1499,13 @@ typedef enum { of miliseconds. */ CINIT(ACCEPTTIMEOUT_MS, LONG, 212), + /* Set TCP keepalive */ + CINIT(TCP_KEEPALIVE, LONG, 213), + + /* non-universal keepalive knobs (Linux, AIX, HP-UX, more) */ + CINIT(TCP_KEEPIDLE, LONG, 214), + CINIT(TCP_KEEPINTVL, LONG, 215), + CURLOPT_LASTENTRY /* the last unused */ } CURLoption; diff --git a/lib/connect.c b/lib/connect.c index f76ec0e..f882db5 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -91,6 +91,35 @@ static bool verifyconnect(curl_socket_t sockfd, int *error); +static void +tcpkeepalive(struct SessionHandle *data, + int sockfd) +{ + int optval = data->set.tcp_keepalive; + + /* don't abort operation if any setsockopt fails, just log to debug */ + if(setsockopt(sockfd, SOL_SOCKET, SO_KEEPALIVE, + (void *)&optval, sizeof(optval)) < 0) { + infof(data, "Failed to set SO_KEEPALIVE on fd %d\n", sockfd); + } + else { +#ifdef TCP_KEEPIDLE + optval = data->set.tcp_keepidle; + if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPIDLE, + (void *)&optval, sizeof(optval)) < 0) { + infof(data, "Failed to set TCP_KEEPIDLE on fd %d\n", sockfd); + } +#endif +#ifdef TCP_KEEPINTVL + optval = data->set.tcp_keepintvl; + if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPINTVL, + (void *)&optval, sizeof(optval)) < 0) { + infof(data, "Failed to set TCP_KEEPINTVL on fd %d\n", sockfd); + } +#endif + } +} + static CURLcode singleipconnect(struct connectdata *conn, const Curl_addrinfo *ai, /* start connecting to this */ @@ -874,6 +903,9 @@ singleipconnect(struct connectdata *conn, Curl_sndbufset(sockfd); + if(data->set.tcp_keepalive) + tcpkeepalive(data, sockfd); + if(data->set.fsockopt) { /* activate callback for setting socket options */ error = data->set.fsockopt(data->set.sockopt_client, diff --git a/lib/url.c b/lib/url.c index 466748b..9d66e76 100644 --- a/lib/url.c +++ b/lib/url.c @@ -742,6 +742,13 @@ CURLcode Curl_init_userdefined(struct UserDefined *set) set->chunk_bgn = ZERO_NULL; set->chunk_end = ZERO_NULL; + /* tcp keepalives are disabled by default, but provide reasonable values for + * the interval and idle times. + */ + set->tcp_keepalive = 0; + set->tcp_keepintvl = 60; + set->tcp_keepidle = 60; + return res; } @@ -805,6 +812,7 @@ CURLcode Curl_open(struct SessionHandle **curl) multi stack. */ } + if(res) { Curl_resolver_cleanup(data->state.resolver); if(data->state.headerbuff) @@ -2539,6 +2547,18 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, result = Curl_set_dns_servers(data, va_arg(param, char *)); break; + case CURLOPT_TCP_KEEPALIVE: + data->set.tcp_keepalive = (0 != va_arg(param, long))?TRUE:FALSE; + break; + + case CURLOPT_TCP_KEEPIDLE: + data->set.tcp_keepidle = va_arg(param, long); + break; + + case CURLOPT_TCP_KEEPINTVL: + data->set.tcp_keepintvl = va_arg(param, long); + break; + default: /* unknown tag and its companion, just ignore: */ result = CURLE_UNKNOWN_OPTION; diff --git a/lib/urldata.h b/lib/urldata.h index adabf5b..a959bc7 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -1539,6 +1539,10 @@ struct UserDefined { long gssapi_delegation; /* GSSAPI credential delegation, see the documentation of CURLOPT_GSSAPI_DELEGATION */ + + bool tcp_keepalive; /* use TCP keepalives */ + long tcp_keepidle; /* seconds in idle before sending keepalive probe */ + long tcp_keepintvl; /* seconds between TCP keepalive probes */ }; struct Names { -- 1.7.8.4

1 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.1-158-gbe038f9
by dan＠archlinux.org 23 Jan '12

23 Jan '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via be038f9cb2d4302d74c0edadd9abf2b282adc7c3 (commit) via ac239c54d0b8f83ee8a0a94456fc84da7f583ccb (commit) via e50c4a8837cedf47c2fe1a2c6064b4dc03dc5b03 (commit) via 825b4ff35aa676b139dc24bc651724b092f2fded (commit) via a03c35125ec729b914600b7c24084f83a05a5ede (commit) via 44f146f232be5203fb01ad35fdf73122838df97c (commit) via edd4276bbf3d21a7353e3d67ce6639246ef8032d (commit) via df47136bcfd3fdec150fc8613f3fe243432d875f (commit) via de56874cc9cdbfa96dd6360818ee6f21da3e1c86 (commit) via 1eb40c83287b07ac7428ad2d58504f386fad98f1 (commit) via 562109c0e8717eaac3b9078271c4ca4f82abfecd (commit) via b3612e9cc198f198b3806efa461bf6fc04dd4502 (commit) via 1b50223f8240456b8c989b5c1e016f4a245b527c (commit) via c77cec2ffc850fa28c5720b8902acc5421069ae4 (commit) via c231c9af9712e95e58f660d46bd8feaf6fd891e2 (commit) via 24ca6ce1f969a6f5d3ef9277f6d20efcd76330ec (commit) via 430b0df7794815049f37f38df39c71e1a9e9c157 (commit) via d9af1a0cf2383eed009ed2bedfb1b34f1a5c7418 (commit) via 4e60b9646d69227c6c9f226bf03a12158feaaee7 (commit) via b426488e2b1cf4e464f7f56dbcf2629a3a73a54a (commit) via 7b1a86b8939f59693f8bb0ea0454a702d5e2434e (commit) via be229d129eeb43e774217921e1c7e1bb802775fe (commit) via e8a2c2545608c556cb65d96e7015a1d09d8b3890 (commit) via 6e8ca48cbb22c328deab56b1740be04ea7ddba6e (commit) via b6209b4ba495dd4379806b72735dac78b8843c03 (commit) from 4f02b98338437b9395addb29000893b91d1ae21e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit be038f9cb2d4302d74c0edadd9abf2b282adc7c3 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jan 18 21:43:00 2012 -0600 Remove rmrf implementation from backend This moves the code for removal of local database entries right into be_local.c, which was the last user of the rmrf() function we had in our utility source file. We can simplify the implementation and make it non-recursive as we know the structure of the local database entries. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ac239c54d0b8f83ee8a0a94456fc84da7f583ccb Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jan 18 22:09:43 2012 -0600 libalpm/deps.c: access trans flags directly Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e50c4a8837cedf47c2fe1a2c6064b4dc03dc5b03 Merge: b3612e9 825b4ff Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jan 23 12:19:51 2012 -0600 Merge branch 'maint' Conflicts: lib/libalpm/diskspace.c src/pacman/util.h commit b3612e9cc198f198b3806efa461bf6fc04dd4502 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jan 11 15:39:52 2012 -0600 Allow UseDelta option to specify a delta ratio Rework the frontend and backend to allow passing a ratio value in for UseDelta rather than having a hardcoded #define-d 0.7 value always used. This is useful for those with fast connections, who would likely benefit from tuning this ratio to lower values; it is also useful for general testing purposes. The libalpm API changes for this, but we do support the old config file format with a no-value 'UseDelta' option; in this case we simply use the old default of 0.7. We clamp the ratio values to a sane range between 0.0 and 2.0, allowing ratios above 1.0 for testing purposes. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6e8ca48cbb22c328deab56b1740be04ea7ddba6e Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jan 11 12:04:34 2012 -0600 Reorder some operations in sig check for efficiency We don't need to open the data to be checked if we don't have a signature to check against, so postpone that open until we know we have either the base64_data or a valid signature file. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 4 +- contrib/bash_completion.in | 4 +- contrib/zsh_completion.in | 2 +- doc/pacman.8.txt | 2 +- doc/pacman.conf.5.txt | 10 ++- doc/vercmp.8.txt | 9 ++- etc/pacman.conf.in | 2 +- lib/libalpm/alpm.h | 4 +- lib/libalpm/be_local.c | 40 +++++++++- lib/libalpm/delta.c | 3 +- lib/libalpm/delta.h | 3 - lib/libalpm/deps.c | 6 +- lib/libalpm/diskspace.c | 56 +++++++++++++- lib/libalpm/dload.c | 155 ++++++++++++++++++++++++++++++--------- lib/libalpm/handle.c | 12 ++- lib/libalpm/handle.h | 2 +- lib/libalpm/remove.c | 2 +- lib/libalpm/signing.c | 22 ++---- lib/libalpm/sync.c | 4 +- lib/libalpm/util.c | 50 +------------ lib/libalpm/util.h | 2 +- scripts/makepkg.sh.in | 17 +++-- scripts/pacman-key.sh.in | 174 ++++++++++++++++++++++++++++++++++++-------- scripts/repo-add.sh.in | 24 ++++-- src/pacman/conf.c | 19 ++++- src/pacman/conf.h | 2 +- src/pacman/pacman.c | 4 +- src/pacman/sync.c | 34 +++------ src/pacman/util.c | 33 ++++----- src/pacman/util.h | 3 +- 30 files changed, 474 insertions(+), 230 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.1-45-g825b4ff
by dan＠archlinux.org 23 Jan '12

23 Jan '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via 825b4ff35aa676b139dc24bc651724b092f2fded (commit) via a03c35125ec729b914600b7c24084f83a05a5ede (commit) via 44f146f232be5203fb01ad35fdf73122838df97c (commit) from edd4276bbf3d21a7353e3d67ce6639246ef8032d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 825b4ff35aa676b139dc24bc651724b092f2fded Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Jan 22 18:46:23 2012 -0500 lib/dload: give uniform naming to curl CB functions Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a03c35125ec729b914600b7c24084f83a05a5ede Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jan 23 12:15:53 2012 -0600 Fix sys/mnttab.h header include Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 44f146f232be5203fb01ad35fdf73122838df97c Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Jan 21 21:31:39 2012 -0500 lib/dload: enforce usage of TCP keepalives This is particularly important in the case of FTP control connections, which may be closed by rogue NAT/firewall devices detecting idle connections on larger transfers which may take 5-10+ minutes. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 3 +- lib/libalpm/diskspace.c | 4 +- lib/libalpm/dload.c | 61 +++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 61 insertions(+), 7 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.1-42-gedd4276
by dan＠archlinux.org 23 Jan '12

23 Jan '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via edd4276bbf3d21a7353e3d67ce6639246ef8032d (commit) via df47136bcfd3fdec150fc8613f3fe243432d875f (commit) via de56874cc9cdbfa96dd6360818ee6f21da3e1c86 (commit) via 1eb40c83287b07ac7428ad2d58504f386fad98f1 (commit) via 562109c0e8717eaac3b9078271c4ca4f82abfecd (commit) via 1b50223f8240456b8c989b5c1e016f4a245b527c (commit) via c77cec2ffc850fa28c5720b8902acc5421069ae4 (commit) via c231c9af9712e95e58f660d46bd8feaf6fd891e2 (commit) via 24ca6ce1f969a6f5d3ef9277f6d20efcd76330ec (commit) via 430b0df7794815049f37f38df39c71e1a9e9c157 (commit) via d9af1a0cf2383eed009ed2bedfb1b34f1a5c7418 (commit) via 4e60b9646d69227c6c9f226bf03a12158feaaee7 (commit) via b426488e2b1cf4e464f7f56dbcf2629a3a73a54a (commit) via 7b1a86b8939f59693f8bb0ea0454a702d5e2434e (commit) via be229d129eeb43e774217921e1c7e1bb802775fe (commit) via e8a2c2545608c556cb65d96e7015a1d09d8b3890 (commit) via b6209b4ba495dd4379806b72735dac78b8843c03 (commit) from 73d0d743bda5367fcab2453bbe21c15e481150c2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit edd4276bbf3d21a7353e3d67ce6639246ef8032d Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jan 20 23:25:57 2012 +1000 makepkg: restrict usage of flags passed to pacman With pacman-4.0, using --noconfirm or --noprogressbar with -Q or -T results in pacman reporting an "invalid option" error. Restrict the passing of these options to pacman. Fixes FS#28012. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit df47136bcfd3fdec150fc8613f3fe243432d875f Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jan 20 23:20:52 2012 +1000 makepkg: fix error on unnecessary -r The grep statement used to check for a difference between the installed package list before and after resolving dependencies returns 1 if there is no difference. This sets of the error trap when "-r" is used "unnecessarily". Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit de56874cc9cdbfa96dd6360818ee6f21da3e1c86 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jan 19 16:23:57 2012 -0600 contrib/bash_completion: don't print stderr messages If you are a crazy developer like me and have bogus options in your pacman.conf file, the tab completion gets messed up by the output on stderr. Suppress it. Fix the same basic issue in zsh_completion, thanks to the work by Florian Pritz <bluewind(a)xinu.at>. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1eb40c83287b07ac7428ad2d58504f386fad98f1 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jan 19 16:21:06 2012 -0600 Add diskspace checking support for Solaris/Illumos Was able to get my hands on one of these boxes today, so add yet another new way of doing this. I'm glad these calls are so standardized. This was compile tested on Linux and Illumos and seems to still be working in both places. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 562109c0e8717eaac3b9078271c4ca4f82abfecd Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jan 18 22:25:27 2012 -0600 Update copyright on changed files since beginning of year Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1b50223f8240456b8c989b5c1e016f4a245b527c Author: Olivier Brunel <i.am.jack.mail(a)gmail.com> Date: Mon Jan 9 21:37:31 2012 +0100 util.c, rmrf(): only create string when needed The entry's name is only used when not "." or ".." so only print the string then. Signed-off-by: Olivier Brunel <i.am.jack.mail(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c77cec2ffc850fa28c5720b8902acc5421069ae4 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Jan 19 11:29:36 2012 +1000 Fix missing [removal] output Currently, a transaction is considered to be purely package removal until the first package install is found. This resulted in the removed packages at the start of a combined upgrade/removal transaction not getting the "[removal]" output. Fixes FS#27981. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c231c9af9712e95e58f660d46bd8feaf6fd891e2 Author: canyonknight <canyonknight(a)gmail.com> Date: Mon Jan 16 19:12:41 2012 -0500 Improve exit statuses and error messages in pacman-key Return codes from gpg commands are currently lost. This adds the functionality of taking non-zero exit statuses from gpg. This includes error reporting for all gpg commands that are run individually, run in a loop, and run through a pipe. Includes the check_keyids_exist function which verifies a key exists locally prior to attempted local manipulation of the key. If a gpg command has a non-zero status, pacman-key will now exit with a non-zero status. It will print a gettext error message of gpg's failure. Signed-off-by: canyonknight <canyonknight(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 24ca6ce1f969a6f5d3ef9277f6d20efcd76330ec Author: canyonknight <canyonknight(a)gmail.com> Date: Mon Jan 16 19:09:56 2012 -0500 Turn gpg commands into functions in pacman-key Adds functions for every gpg command. By pulling out the gpg commands from the "program start" section, additional commands can be run before or after a specific gpg command without adding additional clutter to the function call section. Adds an explicit exit status of 0 to prevent arithmetic expansions from returning non-zero, thereby falsely causing pacman-key to have a non-zero exit status. This change creates the framework for additional error messages and better exit statuses being added to every pacman-key gpg call. Signed-off-by: canyonknight <canyonknight(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 430b0df7794815049f37f38df39c71e1a9e9c157 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jan 12 09:32:19 2012 -0600 repo-add: clean up help messages Use consistent blank lines across all commands, get rid of the translated double newlines which only serve to confuse translators, and fix -h/--help for that extra special third command this script offers. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d9af1a0cf2383eed009ed2bedfb1b34f1a5c7418 Author: Olivier Brunel <i.am.jack.mail(a)gmail.com> Date: Thu Jan 12 16:08:48 2012 +0100 Fix broken output when asking question and stdin is piped When asking question and stdin is piped, the response does not get printed out, resulting in a missing \n and broken output (FS#27909); printing the response fixes it. Signed-off-by: Olivier Brunel <i.am.jack.mail(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4e60b9646d69227c6c9f226bf03a12158feaaee7 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Jan 14 15:27:48 2012 -0500 fetch_url: look for files in cache before downloading We lost this logic somewhere between the libfetch and libcurl transition, as it existed in the internal downloader, but was pulled back only into the sync workflow. Add a helper function that will let us check for existance in the filecache prior to calling the downloader. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b426488e2b1cf4e464f7f56dbcf2629a3a73a54a Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jan 18 15:32:48 2012 -0600 Use isdigit() rather than character range comparisons This is safer and guaranteed to work with even exotic character sets. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7b1a86b8939f59693f8bb0ea0454a702d5e2434e Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jan 18 15:32:34 2012 -0600 Remove unused strtoupper() function Signed-off-by: Dan McGee <dan(a)archlinux.org> commit be229d129eeb43e774217921e1c7e1bb802775fe Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jan 18 12:12:39 2012 -0600 Don't remove unknown files in cache cleaning code This removes the hack I added to skip '*.sig' files earlier since there are other files that also fall into the same bucket- source packages from `makepkg --source`, delta files, etc. Rather than prompting for each and every one, simply skip them. Doing '-Scc' rather than '-Sc' will delete these files if that is really what you want to do. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e8a2c2545608c556cb65d96e7015a1d09d8b3890 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jan 12 17:29:14 2012 -0600 doc/vercmp: add note about pkgrel handling This comes from the Doxygen function documentation. Also, fix two rather silly misspellings. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b6209b4ba495dd4379806b72735dac78b8843c03 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jan 12 07:47:29 2012 -0600 Use fileno() in isatty() call This was our only use of the function that had a hardcoded file descriptor. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 3 +- contrib/bash_completion.in | 4 +- contrib/zsh_completion.in | 2 +- doc/pacman.8.txt | 2 +- doc/vercmp.8.txt | 9 ++- lib/libalpm/diskspace.c | 54 ++++++++++++- lib/libalpm/dload.c | 94 +++++++++++++++-------- lib/libalpm/remove.c | 2 +- lib/libalpm/signing.c | 2 +- lib/libalpm/util.c | 10 +- scripts/makepkg.sh.in | 17 +++-- scripts/pacman-key.sh.in | 174 ++++++++++++++++++++++++++++++++++++-------- scripts/repo-add.sh.in | 24 ++++-- src/pacman/pacman.c | 4 +- src/pacman/sync.c | 34 +++------ src/pacman/util.c | 33 ++++----- src/pacman/util.h | 3 +- 17 files changed, 330 insertions(+), 141 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/2] lib/dload: enforce usage of TCP keepalives
by Dave Reisner 23 Jan '12

23 Jan '12

This is particularly important in the case of FTP control connections, which may be closed by rogue NAT/firewall devices detecting idle connections on larger transfers which may take 5-10+ minutes. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- This is basically on the advice of Daniel Stenberg, who mentions that it's a common problem that he's aware of. I have no idea if this is actually the fix we're looking for and I'm still unable to reproduce, but it seems plausible solution. Also, fuck FTP. configure.ac | 7 +++-- lib/libalpm/dload.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 6941054..c8ba03f 100644 --- a/configure.ac +++ b/configure.ac @@ -174,9 +174,10 @@ AM_CONDITIONAL([HAVE_LIBGPGME], [test "x$with_gpgme" = "xyes"]) # Checks for header files. AC_CHECK_HEADERS([fcntl.h float.h glob.h libintl.h limits.h locale.h \ - mntent.h stddef.h string.h sys/ioctl.h sys/mount.h \ - sys/param.h sys/statvfs.h sys/time.h sys/types.h \ - sys/ucred.h syslog.h termios.h wchar.h]) + mntent.h netinet/in.h netinet/tcp.h stddef.h string.h \ + sys/ioctl.h sys/mount.h sys/param.h sys/statvfs.h \ + sys/time.h sys/types.h sys/ucred.h syslog.h termios.h \ + wchar.h]) # Checks for typedefs, structures, and compiler characteristics. AC_C_INLINE diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index a3980d6..790080c 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -23,11 +23,19 @@ #include <errno.h> #include <string.h> #include <unistd.h> +#include <sys/socket.h> /* setsockopt, SO_KEEPALIVE */ #include <sys/time.h> #include <sys/types.h> #include <sys/stat.h> #include <signal.h> +#ifdef _HAVE_NETINET_IN_H +#include <netinet/in.h> /* IPPROTO_TCP */ +#endif +#ifdef _HAVE_NETINET_TCP_H +#include <netinet/tcp.h> /* TCP_KEEPINTVL, TCP_KEEPIDLE */ +#endif + #ifdef HAVE_LIBCURL #include <curl/curl.h> #endif @@ -215,6 +223,53 @@ static size_t parse_headers(void *ptr, size_t size, size_t nmemb, void *user) return realsize; } +static int curl_sockopt_cb(void *userdata, curl_socket_t curlfd, + curlsocktype purpose) +{ + alpm_handle_t *handle = userdata; + + int onoff = 1; + +#ifdef TCP_KEEPIDLE + int keepidle = TCP_KEEPIDLE; +#endif +#ifdef TCP_KEEPINTVL + int keepintvl = TCP_KEEPINTVL; +#endif + + switch(purpose) { + case CURLSOCKTYPE_IPCXN: + if(setsockopt(curlfd, SOL_SOCKET, SO_KEEPALIVE, (void *)&onoff, + sizeof(onoff)) < 0) { + /* don't abort operation, just log to debug */ + _alpm_log(handle, ALPM_LOG_DEBUG, "Failed to set SO_KEEPALIVE on fd %d\n", + curlfd); + } + else { +#ifdef TCP_KEEPIDLE + if(setsockopt(curlfd, IPPROTO_TCP, TCP_KEEPIDLE, (void *)&keepidle, + sizeof(keepidle)) < 0) { + /* don't abort operation, just log to debug */ + _alpm_log(handle, ALPM_LOG_DEBUG, "Failed to set TCP_KEEPIDLE on fd %d\n", + curlfd); + } +#endif +#ifdef TCP_KEEPINTVL + if(setsockopt(curlfd, IPPROTO_TCP, TCP_KEEPINTVL, (void *)&keepintvl, + sizeof(keepintvl)) < 0) { + /* don't abort operation, just log to debug */ + _alpm_log(handle, ALPM_LOG_DEBUG, "Failed to set TCP_KEEPINTVL on fd %d\n", + curlfd); + } +#endif + } + default: + break; + } + + return 0; +} + static void curl_set_handle_opts(struct dload_payload *payload, CURL *curl, char *error_buffer) { @@ -239,6 +294,8 @@ static void curl_set_handle_opts(struct dload_payload *payload, curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, parse_headers); curl_easy_setopt(curl, CURLOPT_WRITEHEADER, (void *)payload); curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL); + curl_easy_setopt(curl, CURLOPT_SOCKOPTFUNCTION, curl_sockopt_cb); + curl_easy_setopt(curl, CURLOPT_SOCKOPTDATA, (void *)handle); _alpm_log(handle, ALPM_LOG_DEBUG, "url: %s\n", payload->fileurl); @@ -388,6 +445,8 @@ static int curl_download_internal(struct dload_payload *payload, /* perform transfer */ payload->curlerr = curl_easy_perform(curl); + _alpm_log(handle, ALPM_LOG_DEBUG, "curl returned error %d from transfer\n", + payload->curlerr); /* disconnect relationships from the curl handle for things that might go out * of scope, but could still be touched on connection teardown. This really -- 1.7.8.4

3 5

[pacman-dev] [PATCH] makepkg: fix error on unnecessary -r
by Allan McRae 23 Jan '12

23 Jan '12

The grep statement used to check for a difference between the installed package list before and after resolving dependencies returns 1 if there is no difference. This sets of the error trap when "-r" is used "unnecessarily". Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Dave: would you prefer this fix or just using $(set +E; grep ...) scripts/makepkg.sh.in | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index f6d8294..4792c5c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -507,14 +507,15 @@ remove_deps() { # check for packages removed during dependency install (e.g. due to conflicts) # removing all installed packages is risky in this case if [[ -n $(grep -xvFf <(printf '%s\n' "${current_packagelist[@]}") \ - <(printf '%s\n' "${original_packagelist[@]}") ) ]]; then + <(printf '%s\n' "${original_packagelist[@]}") || true) ]]; then warning "$(gettext "Failed to remove installed dependencies.")" return 0 fi local deplist - if ! deplist=($(grep -xvFf <(printf "%s\n" "${original_pkglist[@]}") \ - <(printf "%s\n" "${current_pkglist[@]}"))); then + deplist=($(grep -xvFf <(printf "%s\n" "${original_pkglist[@]}") \ + <(printf "%s\n" "${current_pkglist[@]}") || true)) + if [[ -n deplist ]]; then return fi -- 1.7.8.4

2 5

[pacman-dev] compiling pacman and python wrapper
by Andrea Crotti 22 Jan '12

22 Jan '12

I would like to create a python wrapper to access to pacman features, and so I started to take a look about how it works.. The first thing that I noted is that the INSTALL instructions are a bit confusing. Because it says: --8<---------------cut here---------------start------------->8--- Briefly, the shell commands `./configure; make; make install' should configure, build, and install this package. The following instructions are generic. Run `./configure --help` for specific options. --8<---------------cut here---------------end--------------->8--- But actually there is no "configure" until autoconf is run, but that is explained only later. So maybe just inverting the order might be fine, first talking about autoconf and configure.ac and after talking about configure && make. Then I was actually trying to compile it myself but I get on configure: --8<---------------cut here---------------start------------->8--- configure: creating ./config.status config.status: error: cannot find input file: `lib/libalpm/Makefile.in' --8<---------------cut here---------------end--------------->8--- (from the git repository). And about my original idea, is anyone interested? From what I've understood I think I might use SWIG using the file alpm.h as header and export all the symbols in a nice Python wrapper, does it make sense?

4 6

[pacman-dev] Checking whether a package was signed
by kachelaqa 22 Jan '12

22 Jan '12

I'm still trying to get to grips with package signing, so this question may not make complete sense, but: Is there a way to check whether the signature was verified when a package was installed?

3 6

[pacman-dev] [PATCH] makepkg: retrist usage of flags passed to pacman
by Allan McRae 20 Jan '12

20 Jan '12

With pacman-4.0, using --noconfirm or --noprogressbar with -Q or -T results in pacman reporting an "invalid option" error. Restrict the passing of these options to pacman. Fixes FS#28012. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4792c5c..4f95b73 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -412,7 +412,11 @@ download_file() { run_pacman() { local cmd - printf -v cmd "%q " "$PACMAN" $PACMAN_OPTS "$@" + if [[ ! $1 = -@(T|Qq) ]]; then + printf -v cmd "%q " "$PACMAN" $PACMAN_OPTS "$@" + else + printf -v cmd "%q " "$PACMAN" $PACMAN_OPTS "$@" + fi if (( ! ASROOT )) && [[ ! $1 = -@(T|Qq) ]]; then if type -p sudo >/dev/null; then cmd="sudo $cmd" -- 1.7.8.4

2 3

[pacman-dev] [PATCH 1/2] Add diskspace checking support for Solaris/Illumos
by Dan McGee 19 Jan '12

19 Jan '12

Was able to get my hands on one of these boxes today, so add yet another new way of doing this. I'm glad these calls are so standardized. This was compile tested on Linux and Illumos and seems to still be working in both places. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- configure.ac | 3 +- lib/libalpm/diskspace.c | 54 ++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 51 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 0de908a..a8b142e 100644 --- a/configure.ac +++ b/configure.ac @@ -173,7 +173,8 @@ AM_CONDITIONAL([HAVE_LIBGPGME], [test "x$with_gpgme" = "xyes"]) # Checks for header files. AC_CHECK_HEADERS([fcntl.h float.h glob.h libintl.h limits.h locale.h \ - mntent.h stddef.h string.h sys/ioctl.h sys/mount.h \ + mntent.h stddef.h string.h sys/ioctl.h \ + sys/mnttab.h sys/mount.h \ sys/param.h sys/statvfs.h sys/time.h sys/types.h \ sys/ucred.h syslog.h termios.h wchar.h]) diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index fe2036d..4127153 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -1,7 +1,7 @@ /* * diskspace.c * - * Copyright (c) 2010-2011 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2010-2012 Pacman Development Team <pacman-dev(a)archlinux.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,10 +19,15 @@ #include "config.h" +#include <stdio.h> #include <errno.h> + #if defined(HAVE_MNTENT_H) #include <mntent.h> #endif +#if defined(HAVE_MNTTAB_H) +#include <mnttab.h> +#endif #if defined(HAVE_SYS_STATVFS_H) #include <sys/statvfs.h> #endif @@ -60,10 +65,10 @@ static alpm_list_t *mount_point_list(alpm_handle_t *handle) alpm_list_t *mount_points = NULL, *ptr; alpm_mountpoint_t *mp; -#if defined HAVE_GETMNTENT +#if defined(HAVE_GETMNTENT) && defined(HAVE_MNTENT_H) + /* Linux */ struct mntent *mnt; FILE *fp; - struct statvfs fsp; fp = setmntent(MOUNTED, "r"); @@ -72,8 +77,10 @@ static alpm_list_t *mount_point_list(alpm_handle_t *handle) } while((mnt = getmntent(fp))) { + struct statvfs fsp; if(!mnt) { - _alpm_log(handle, ALPM_LOG_WARNING, _("could not get filesystem information\n")); + _alpm_log(handle, ALPM_LOG_WARNING, + _("could not get filesystem information\n")); continue; } if(statvfs(mnt->mnt_dir, &fsp) != 0) { @@ -93,7 +100,44 @@ static alpm_list_t *mount_point_list(alpm_handle_t *handle) } endmntent(fp); -#elif defined HAVE_GETMNTINFO +#elif defined(HAVE_GETMNTENT) && defined(HAVE_MNTTAB_H) + /* Solaris, Illumos */ + struct mnttab mnt; + FILE *fp; + int ret; + + fp = fopen("/etc/mnttab", "r"); + + if(fp == NULL) { + return NULL; + } + + while((ret = getmntent(fp, &mnt)) == 0) { + struct statvfs fsp; + if(statvfs(mnt->mnt_mountp, &fsp) != 0) { + _alpm_log(handle, ALPM_LOG_WARNING, + _("could not get filesystem information for %s: %s\n"), + mnt->mnt_mountp, strerror(errno)); + continue; + } + + CALLOC(mp, 1, sizeof(alpm_mountpoint_t), RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); + mp->mount_dir = strdup(mnt->mnt_mountp); + mp->mount_dir_len = strlen(mp->mount_dir); + memcpy(&(mp->fsp), &fsp, sizeof(struct statvfs)); + mp->read_only = fsp.f_flag & ST_RDONLY; + + mount_points = alpm_list_add(mount_points, mp); + } + /* -1 == EOF */ + if(ret != -1) { + _alpm_log(handle, ALPM_LOG_WARNING, + _("could not get filesystem information\n")); + } + + fclose(fp); +#elif defined(HAVE_GETMNTINFO) + /* FreeBSD (statfs), NetBSD (statvfs), OpenBSD (statfs), OS X (statfs) */ int entries; FSSTATSTYPE *fsp; -- 1.7.8.3

1 1

[pacman-dev] [PATCH] Fix missing [removal] output
by Allan McRae 19 Jan '12

19 Jan '12

Currently, a transaction is considered to be purely package removal until the first package install is found. This resulted in the removed packages at the start of a combined upgrade/removal transaction not getting the "[removal]" output. Fixes FS#27981. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/util.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 40690e8..2eac429 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -898,8 +898,12 @@ static void _display_targets(alpm_list_t *targets, int verbose) /* add up size of all removed packages */ rsize += alpm_pkg_get_isize(target->remove); } + } + + /* form data for both verbose and non-verbose display */ + for(i = targets; i; i = alpm_list_next(i)) { + pm_target_t *target = i->data; - /* form data for both verbose and non-verbose display */ rows = alpm_list_add(rows, create_verbose_row(target, show_dl_size)); if(target->install) { pm_asprintf(&str, "%s-%s", alpm_pkg_get_name(target->install), -- 1.7.8.3

1 0

[pacman-dev] Rationale for the patch for case insensitive configuration values
by Alexander Rødseth 18 Jan '12

18 Jan '12

Hi, I understand that case sensitivity can, perhaps, bring clarity for configuration values like ILoveCandy, but IMO, both "Never" and "never" should be allowed, as the uppercase letters bring no more clarity, but add an additional requirement for the users to conform to. That is the reason for the patch. Also, in the name of consistency, I changed all the checks in conf.c, not just the check for the word "Never". This is about simplicity and removing a constraint that users shouldn't have to relate to when editing pacman.conf. I tested both compilation and execution of the resulting pacman binary and it works fine here. -- Sincerely, Alexander Rødseth Arch Linux Trusted User (xyproto on IRC, trontonic on AUR)

3 4

[pacman-dev] XfreCommand curl option in pacman.conf and makepkg.conf
by Keshav P R 18 Jan '12

18 Jan '12

Hi, Using XferCommand = /usr/bin/curl -C - -f -o %o %u XferCommand = /usr/bin/curl -C - -f %u > %o enables curl to resume downloads to %o , if it is supported. Using file redirection "> %o" makes curl restart the (partial) downloads from first. The same goes for makepkg.conf . Please change it. Regards. Keshav

2 1

[pacman-dev] [PATCH] Case insensitive configuration values (to allow both SigLevel = Never and SigLevel = never)
by Alexander Rødseth 17 Jan '12

17 Jan '12

--- src/pacman/conf.c | 66 ++++++++++++++++++++++++++-------------------------- 1 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 7ba2791..f114339 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -225,7 +225,7 @@ cleanup: int config_set_arch(const char *arch) { - if(strcmp(arch, "auto") == 0) { + if(strcasecmp(arch, "auto") == 0) { struct utsname un; uname(&un); config->arch = strdup(un.machine); @@ -272,14 +272,14 @@ static int process_siglevel(alpm_list_t *values, alpm_siglevel_t *storage, } /* now parse out and store actual flag if it is valid */ - if(strcmp(value, "Never") == 0) { + if(strcasecmp(value, "Never") == 0) { if(package) { level &= ~ALPM_SIG_PACKAGE; } if(database) { level &= ~ALPM_SIG_DATABASE; } - } else if(strcmp(value, "Optional") == 0) { + } else if(strcasecmp(value, "Optional") == 0) { if(package) { level |= ALPM_SIG_PACKAGE; level |= ALPM_SIG_PACKAGE_OPTIONAL; @@ -288,7 +288,7 @@ static int process_siglevel(alpm_list_t *values, alpm_siglevel_t *storage, level |= ALPM_SIG_DATABASE; level |= ALPM_SIG_DATABASE_OPTIONAL; } - } else if(strcmp(value, "Required") == 0) { + } else if(strcasecmp(value, "Required") == 0) { if(package) { level |= ALPM_SIG_PACKAGE; level &= ~ALPM_SIG_PACKAGE_OPTIONAL; @@ -297,7 +297,7 @@ static int process_siglevel(alpm_list_t *values, alpm_siglevel_t *storage, level |= ALPM_SIG_DATABASE; level &= ~ALPM_SIG_DATABASE_OPTIONAL; } - } else if(strcmp(value, "TrustedOnly") == 0) { + } else if(strcasecmp(value, "TrustedOnly") == 0) { if(package) { level &= ~ALPM_SIG_PACKAGE_MARGINAL_OK; level &= ~ALPM_SIG_PACKAGE_UNKNOWN_OK; @@ -306,7 +306,7 @@ static int process_siglevel(alpm_list_t *values, alpm_siglevel_t *storage, level &= ~ALPM_SIG_DATABASE_MARGINAL_OK; level &= ~ALPM_SIG_DATABASE_UNKNOWN_OK; } - } else if(strcmp(value, "TrustAll") == 0) { + } else if(strcasecmp(value, "TrustAll") == 0) { if(package) { level |= ALPM_SIG_PACKAGE_MARGINAL_OK; level |= ALPM_SIG_PACKAGE_UNKNOWN_OK; @@ -345,9 +345,9 @@ static int process_cleanmethods(alpm_list_t *values, alpm_list_t *i; for(i = values; i; i = alpm_list_next(i)) { const char *value = i->data; - if(strcmp(value, "KeepInstalled") == 0) { + if(strcasecmp(value, "KeepInstalled") == 0) { config->cleanmethod |= PM_CLEAN_KEEPINST; - } else if(strcmp(value, "KeepCurrent") == 0) { + } else if(strcasecmp(value, "KeepCurrent") == 0) { config->cleanmethod |= PM_CLEAN_KEEPCUR; } else { pm_printf(ALPM_LOG_ERROR, @@ -387,22 +387,22 @@ static int _parse_options(const char *key, char *value, { if(value == NULL) { /* options without settings */ - if(strcmp(key, "UseSyslog") == 0) { + if(strcasecmp(key, "UseSyslog") == 0) { config->usesyslog = 1; pm_printf(ALPM_LOG_DEBUG, "config: usesyslog\n"); - } else if(strcmp(key, "ILoveCandy") == 0) { + } else if(strcasecmp(key, "ILoveCandy") == 0) { config->chomp = 1; pm_printf(ALPM_LOG_DEBUG, "config: chomp\n"); - } else if(strcmp(key, "VerbosePkgLists") == 0) { + } else if(strcasecmp(key, "VerbosePkgLists") == 0) { config->verbosepkglists = 1; pm_printf(ALPM_LOG_DEBUG, "config: verbosepkglists\n"); - } else if(strcmp(key, "UseDelta") == 0) { + } else if(strcasecmp(key, "UseDelta") == 0) { config->usedelta = 1; pm_printf(ALPM_LOG_DEBUG, "config: usedelta\n"); - } else if(strcmp(key, "TotalDownload") == 0) { + } else if(strcasecmp(key, "TotalDownload") == 0) { config->totaldownload = 1; pm_printf(ALPM_LOG_DEBUG, "config: totaldownload\n"); - } else if(strcmp(key, "CheckSpace") == 0) { + } else if(strcasecmp(key, "CheckSpace") == 0) { config->checkspace = 1; } else { pm_printf(ALPM_LOG_WARNING, @@ -411,50 +411,50 @@ static int _parse_options(const char *key, char *value, } } else { /* options with settings */ - if(strcmp(key, "NoUpgrade") == 0) { + if(strcasecmp(key, "NoUpgrade") == 0) { setrepeatingoption(value, "NoUpgrade", &(config->noupgrade)); - } else if(strcmp(key, "NoExtract") == 0) { + } else if(strcasecmp(key, "NoExtract") == 0) { setrepeatingoption(value, "NoExtract", &(config->noextract)); - } else if(strcmp(key, "IgnorePkg") == 0) { + } else if(strcasecmp(key, "IgnorePkg") == 0) { setrepeatingoption(value, "IgnorePkg", &(config->ignorepkg)); - } else if(strcmp(key, "IgnoreGroup") == 0) { + } else if(strcasecmp(key, "IgnoreGroup") == 0) { setrepeatingoption(value, "IgnoreGroup", &(config->ignoregrp)); - } else if(strcmp(key, "HoldPkg") == 0) { + } else if(strcasecmp(key, "HoldPkg") == 0) { setrepeatingoption(value, "HoldPkg", &(config->holdpkg)); - } else if(strcmp(key, "SyncFirst") == 0) { + } else if(strcasecmp(key, "SyncFirst") == 0) { setrepeatingoption(value, "SyncFirst", &(config->syncfirst)); - } else if(strcmp(key, "CacheDir") == 0) { + } else if(strcasecmp(key, "CacheDir") == 0) { setrepeatingoption(value, "CacheDir", &(config->cachedirs)); - } else if(strcmp(key, "Architecture") == 0) { + } else if(strcasecmp(key, "Architecture") == 0) { if(!config->arch) { config_set_arch(value); } - } else if(strcmp(key, "DBPath") == 0) { + } else if(strcasecmp(key, "DBPath") == 0) { /* don't overwrite a path specified on the command line */ if(!config->dbpath) { config->dbpath = strdup(value); pm_printf(ALPM_LOG_DEBUG, "config: dbpath: %s\n", value); } - } else if(strcmp(key, "RootDir") == 0) { + } else if(strcasecmp(key, "RootDir") == 0) { /* don't overwrite a path specified on the command line */ if(!config->rootdir) { config->rootdir = strdup(value); pm_printf(ALPM_LOG_DEBUG, "config: rootdir: %s\n", value); } - } else if(strcmp(key, "GPGDir") == 0) { + } else if(strcasecmp(key, "GPGDir") == 0) { if(!config->gpgdir) { config->gpgdir = strdup(value); pm_printf(ALPM_LOG_DEBUG, "config: gpgdir: %s\n", value); } - } else if(strcmp(key, "LogFile") == 0) { + } else if(strcasecmp(key, "LogFile") == 0) { if(!config->logfile) { config->logfile = strdup(value); pm_printf(ALPM_LOG_DEBUG, "config: logfile: %s\n", value); } - } else if(strcmp(key, "XferCommand") == 0) { + } else if(strcasecmp(key, "XferCommand") == 0) { config->xfercommand = strdup(value); pm_printf(ALPM_LOG_DEBUG, "config: xfercommand: %s\n", value); - } else if(strcmp(key, "CleanMethod") == 0) { + } else if(strcasecmp(key, "CleanMethod") == 0) { alpm_list_t *methods = NULL; setrepeatingoption(value, "CleanMethod", &methods); if(process_cleanmethods(methods, file, linenum)) { @@ -462,7 +462,7 @@ static int _parse_options(const char *key, char *value, return 1; } FREELIST(methods); - } else if(strcmp(key, "SigLevel") == 0) { + } else if(strcasecmp(key, "SigLevel") == 0) { alpm_list_t *values = NULL; setrepeatingoption(value, "SigLevel", &values); if(process_siglevel(values, &config->siglevel, file, linenum)) { @@ -751,7 +751,7 @@ static int _parseconfig(const char *file, struct section_t *section, } pm_printf(ALPM_LOG_DEBUG, "config: new section '%s'\n", name); section->name = name; - section->is_options = (strcmp(name, "options") == 0); + section->is_options = (strcasecmp(name, "options") == 0); continue; } @@ -777,7 +777,7 @@ static int _parseconfig(const char *file, struct section_t *section, goto cleanup; } /* Include is allowed in both options and repo sections */ - if(strcmp(key, "Include") == 0) { + if(strcasecmp(key, "Include") == 0) { glob_t globbuf; int globret; size_t gindex; @@ -824,7 +824,7 @@ static int _parseconfig(const char *file, struct section_t *section, } } else if(!parse_options && !section->is_options) { /* ... or in a repo section */ - if(strcmp(key, "Server") == 0) { + if(strcasecmp(key, "Server") == 0) { if(value == NULL) { pm_printf(ALPM_LOG_ERROR, _("config file %s, line %d: directive '%s' needs a value\n"), file, linenum, key); @@ -832,7 +832,7 @@ static int _parseconfig(const char *file, struct section_t *section, goto cleanup; } section->servers = alpm_list_add(section->servers, strdup(value)); - } else if(strcmp(key, "SigLevel") == 0) { + } else if(strcasecmp(key, "SigLevel") == 0) { alpm_list_t *values = NULL; setrepeatingoption(value, "SigLevel", &values); if(values) { -- 1.7.8.3

1 0

[pacman-dev] [PATCH] fetch_url: look for files in cache before downloading
by Dave Reisner 14 Jan '12

14 Jan '12

We lost this logic somewhere between the libfetch and libcurl transition, as it existed in the internal downloader, but was pulled back only into the sync workflow. Add a helper function that will let us check for existance in the filecache prior to calling the downloader. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Ugly patch, for not a whole lot of noise. Pointed out by Ioni that we don't look in the cachedirs anymore for files downloaded via -U. lib/libalpm/dload.c | 92 +++++++++++++++++++++++++++++++++------------------ 1 files changed, 60 insertions(+), 32 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index a3980d6..0092838 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -558,6 +558,22 @@ int _alpm_download(struct dload_payload *payload, const char *localpath, } } +static char *filecache_find_url(alpm_handle_t *handle, const char *url) +{ + const char *basename = strrchr(url, '/'); + + if(basename == NULL) { + return 0; + } + + basename++; + if(basename == '\0') { + return 0; + } + + return _alpm_filecache_find(handle, basename); +} + /** Fetch a remote pkg. */ char SYMEXPORT *alpm_fetch_pkgurl(alpm_handle_t *handle, const char *url) { @@ -565,7 +581,7 @@ char SYMEXPORT *alpm_fetch_pkgurl(alpm_handle_t *handle, const char *url) const char *cachedir; char *final_file = NULL; struct dload_payload payload; - int ret; + int ret = 0; CHECK_HANDLE(handle, return NULL); ASSERT(url, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, NULL)); @@ -574,51 +590,63 @@ char SYMEXPORT *alpm_fetch_pkgurl(alpm_handle_t *handle, const char *url) cachedir = _alpm_filecache_setup(handle); memset(&payload, 0, sizeof(struct dload_payload)); - payload.handle = handle; - STRDUP(payload.fileurl, url, RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); - payload.allow_resume = 1; - - /* download the file */ - ret = _alpm_download(&payload, cachedir, &final_file); - _alpm_dload_payload_reset(&payload); - if(ret == -1) { - _alpm_log(handle, ALPM_LOG_WARNING, _("failed to download %s\n"), url); - free(final_file); - return NULL; + + /* attempt to find the file in our pkgcache */ + filepath = filecache_find_url(handle, url); + if(filepath == NULL) { + STRDUP(payload.fileurl, url, RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); + payload.allow_resume = 1; + payload.handle = handle; + + /* download the file */ + ret = _alpm_download(&payload, cachedir, &final_file); + _alpm_dload_payload_reset(&payload); + if(ret == -1) { + _alpm_log(handle, ALPM_LOG_WARNING, _("failed to download %s\n"), url); + free(final_file); + return NULL; + } + _alpm_log(handle, ALPM_LOG_DEBUG, "successfully downloaded %s\n", url); } - _alpm_log(handle, ALPM_LOG_DEBUG, "successfully downloaded %s\n", url); /* attempt to download the signature */ if(ret == 0 && (handle->siglevel & ALPM_SIG_PACKAGE)) { - char *sig_final_file = NULL; + char *sig_filepath, *sig_final_file = NULL; size_t len; len = strlen(url) + 5; MALLOC(payload.fileurl, len, RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); snprintf(payload.fileurl, len, "%s.sig", url); - payload.handle = handle; - payload.force = 1; - payload.errors_ok = (handle->siglevel & ALPM_SIG_PACKAGE_OPTIONAL); - - /* set hard upper limit of 16KiB */ - payload.max_size = 16 * 1024; - - ret = _alpm_download(&payload, cachedir, &sig_final_file); - if(ret == -1 && !payload.errors_ok) { - _alpm_log(handle, ALPM_LOG_WARNING, - _("failed to download %s\n"), payload.fileurl); - /* Warn now, but don't return NULL. We will fail later during package - * load time. */ - } else if(ret == 0) { - _alpm_log(handle, ALPM_LOG_DEBUG, - "successfully downloaded %s\n", payload.fileurl); + + sig_filepath = filecache_find_url(handle, payload.fileurl); + if(sig_filepath == NULL) { + payload.handle = handle; + payload.force = 1; + payload.errors_ok = (handle->siglevel & ALPM_SIG_PACKAGE_OPTIONAL); + + /* set hard upper limit of 16KiB */ + payload.max_size = 16 * 1024; + + ret = _alpm_download(&payload, cachedir, &sig_final_file); + if(ret == -1 && !payload.errors_ok) { + _alpm_log(handle, ALPM_LOG_WARNING, + _("failed to download %s\n"), payload.fileurl); + /* Warn now, but don't return NULL. We will fail later during package + * load time. */ + } else if(ret == 0) { + _alpm_log(handle, ALPM_LOG_DEBUG, + "successfully downloaded %s\n", payload.fileurl); + } + FREE(sig_final_file); } - FREE(sig_final_file); + free(sig_filepath); _alpm_dload_payload_reset(&payload); } /* we should be able to find the file the second time around */ - filepath = _alpm_filecache_find(handle, final_file); + if(filepath == NULL) { + filepath = _alpm_filecache_find(handle, final_file); + } free(final_file); return filepath; -- 1.7.8.3

1 0

[pacman-dev] [PATCH] [RFC] Add UpgradeSigLevel configuration option
by Allan McRae 13 Jan '12

13 Jan '12

Use to override the global SigLevel value for upgrade operations. e.g. when installing a package without a signature: Fails to install: SigLevel = Optional UpgradeSigLevel = Required Fails to install: SigLevel = Required Installs: SigLevel = Required UpgradeSigLevel = Optional Installs: SigLevel = Optional Signed-off-by: Allan McRae <allan(a)archlinux.org> --- The main issue I see here is that UpgradeSigLevel must come after the global SigLevel value. Otherwise the only way I see to use the value of SigLevel as a default for UpgradeSigLevel requires much code duplication. lib/libalpm/alpm.h | 3 +++ lib/libalpm/handle.c | 21 +++++++++++++++++++++ lib/libalpm/handle.h | 1 + src/pacman/conf.c | 10 ++++++++++ src/pacman/conf.h | 1 + src/pacman/upgrade.c | 2 +- 6 files changed, 37 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 1751c81..d201748 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -544,6 +544,9 @@ int alpm_option_set_checkspace(alpm_handle_t *handle, int checkspace); alpm_siglevel_t alpm_option_get_default_siglevel(alpm_handle_t *handle); int alpm_option_set_default_siglevel(alpm_handle_t *handle, alpm_siglevel_t level); +alpm_siglevel_t alpm_option_get_upgrade_siglevel(alpm_handle_t *handle); +int alpm_option_set_upgrade_siglevel(alpm_handle_t *handle, alpm_siglevel_t level); + /** @} */ /** @addtogroup alpm_api_databases Database Functions diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 6518b7d..e574551 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -628,4 +628,25 @@ alpm_siglevel_t SYMEXPORT alpm_option_get_default_siglevel(alpm_handle_t *handle return handle->siglevel; } +int SYMEXPORT alpm_option_set_upgrade_siglevel(alpm_handle_t *handle, + alpm_siglevel_t level) +{ + CHECK_HANDLE(handle, return -1); +#ifdef HAVE_LIBGPGME + handle->upgradesiglevel = level; +#else + if(level != 0 && level != ALPM_SIG_USE_DEFAULT) { + RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1); + } +#endif + return 0; +} + +alpm_siglevel_t SYMEXPORT alpm_option_get_upgrade_siglevel(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return -1); + return handle->upgradesiglevel; +} + + /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 1f147d6..8535c2b 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -91,6 +91,7 @@ struct __alpm_handle_t { int usedelta; /* Download deltas if possible */ int checkspace; /* Check disk space before installing */ alpm_siglevel_t siglevel; /* Default signature verification level */ + alpm_siglevel_t upgradesiglevel; /* Signature verification level for upgrade operations */ /* error code */ alpm_errno_t pm_errno; diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 117aecd4..abcc4fd 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -469,6 +469,15 @@ static int _parse_options(const char *key, char *value, FREELIST(values); return 1; } + config->upgradesiglevel = config->siglevel; + FREELIST(values); + } else if(strcmp(key, "UpgradeSigLevel") == 0) { + alpm_list_t *values = NULL; + setrepeatingoption(value, "UpgradeSigLevel", &values); + if(process_siglevel(values, &config->upgradesiglevel, file, linenum)) { + FREELIST(values); + return 1; + } FREELIST(values); } else { pm_printf(ALPM_LOG_WARNING, @@ -591,6 +600,7 @@ static int setup_libalpm(void) } alpm_option_set_default_siglevel(handle, config->siglevel); + alpm_option_set_upgrade_siglevel(handle, config->upgradesiglevel); if(config->xfercommand) { alpm_option_set_fetchcb(handle, download_with_xfercommand); diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 325fbb6..9c8d944 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -72,6 +72,7 @@ typedef struct __config_t { unsigned int ask; alpm_transflag_t flags; alpm_siglevel_t siglevel; + alpm_siglevel_t upgradesiglevel; /* conf file options */ /* I Love Candy! */ diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index 87f7c39..12bd421 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -41,7 +41,7 @@ int pacman_upgrade(alpm_list_t *targets) { int retval = 0; alpm_list_t *i; - alpm_siglevel_t level = alpm_option_get_default_siglevel(config->handle); + alpm_siglevel_t level = alpm_option_get_upgrade_siglevel(config->handle); if(targets == NULL) { pm_printf(ALPM_LOG_ERROR, _("no targets specified (use -h for help)\n")); -- 1.7.8.1

4 5

[pacman-dev] [PATCH] doc/vercmp: add note about pkgrel handling
by Dan McGee 12 Jan '12

12 Jan '12

This comes from the Doxygen function documentation. Also, fix two rather silly misspellings. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- doc/vercmp.8.txt | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/doc/vercmp.8.txt b/doc/vercmp.8.txt index 4b0490f..6b94f3e 100644 --- a/doc/vercmp.8.txt +++ b/doc/vercmp.8.txt @@ -6,7 +6,7 @@ vercmp(8) Name ---- -vercmp - version comparsion utility +vercmp - version comparison utility Synopsis @@ -23,7 +23,7 @@ numbers. It outputs values as follows: * = 0 : if ver1 == ver2 * > 0 : if ver1 > ver2 -Version comparsion operates as follows: +Version comparison operates as follows: Alphanumeric: 1.0a < 1.0b < 1.0beta < 1.0p < 1.0pre < 1.0rc < 1.0 < 1.0.a < 1.0.1 @@ -35,6 +35,11 @@ overrule any version comparison (unless the epoch values are equal). This is specified in an `epoch:version-rel` format. For example, `2:1.0-1` is always greater than `1:3.6-1`. +Keep in mind that the 'pkgrel' is only compared if it is available on both +versions given to this tool. For example, comparing `1.5-1` and `1.5` will +yield 0; comparing `1.5-1` and `1.5-2` will yield < 0 as expected. This is +mainly for supporting versioned dependencies that do not include the 'pkgrel'. + Options ------- -- 1.7.8.3

1 0

[pacman-dev] [mkinitcpio][PATCH 1/5] dsdt: remove hook. this has been defunct for years
by Dave Reisner 12 Jan '12

12 Jan '12

Refer to commit 9a9e0d68555 in the kernel where Linus removes this and says "to be revisited later". The only option (currently) is to built this into your kernel image. Suggested by FS#27906. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- install/dsdt | 14 -------------- 1 files changed, 0 insertions(+), 14 deletions(-) delete mode 100644 install/dsdt diff --git a/install/dsdt b/install/dsdt deleted file mode 100644 index b38c66c..0000000 --- a/install/dsdt +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -build() { - add_file "/lib/initcpio/custom.dsdt" "DSDT.aml" -} - -help() { - cat <<HELPEOF -This hook loads a custom acpi dsdt file during boot. Place your custom dsdt -file for inclusion here: /lib/initcpio/custom.dsdt -HELPEOF -} - -# vim: set ft=sh ts=4 sw=4 et: -- 1.7.8.3

2 5

[pacman-dev] [PATCH] Fix broken output when asking question and stdin is piped (FS#27909)
by Olivier Brunel 12 Jan '12

12 Jan '12

When asking question and stdin is piped, the response does not get printed out, resulting in a missing \n and broken output (FS#27909); printing the response fixes it. Signed-off-by: Olivier Brunel <i.am.jack.mail(a)gmail.com> --- src/pacman/util.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 2d88bac..876a15b 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1429,6 +1429,13 @@ static int question(short preset, char *fmt, va_list args) if(len == 0) { return preset; } + + /* if stdin is piped, response does not get printed out, and as a result + * a \n is missing, resulting in broken output (FS#27909) */ + struct stat sb; + if (fstat(STDIN_FILENO, &sb) == 0 && S_ISFIFO(sb.st_mode)) { + fprintf(stream, "%s\n", response); + } if(strcasecmp(response, _("Y")) == 0 || strcasecmp(response, _("YES")) == 0) { return 1; -- 1.7.8.3

4 6

[pacman-dev] [PATCH] repo-add: clean up help messages
by Dan McGee 12 Jan '12

12 Jan '12

Use consistent blank lines across all commands, get rid of the translated double newlines which only serve to confuse translators, and fix -h/--help for that extra special third command this script offers. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/repo-add.sh.in | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 28339e6..cfff102 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -48,30 +48,38 @@ usage() { printf "%s (pacman) %s\n\n" "$cmd" "$myver" if [[ $cmd == "repo-add" ]] ; then printf "$(gettext "Usage: repo-add [options] <path-to-db> <package|delta> ...\n")" + printf "\n" printf "$(gettext "\ repo-add will update a package database by reading a package file.\n\ -Multiple packages to add can be specified on the command line.\n\n")" +Multiple packages to add can be specified on the command line.\n")" + printf "\n" printf "$(gettext "Options:\n")" printf "$(gettext " -d, --delta generate and add delta for package update\n")" printf "$(gettext " -f, --files update database's file list\n")" elif [[ $cmd == "repo-remove" ]] ; then - printf "$(gettext "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\n\n")" + printf "$(gettext "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\n")" + printf "\n" printf "$(gettext "\ repo-remove will update a package database by removing the package name\n\ specified on the command line from the given repo database. Multiple\n\ -packages to remove can be specified on the command line.\n\n")" +packages to remove can be specified on the command line.\n")" + printf "\n" printf "$(gettext "Options:\n")" + else + printf "$(gettext "Please move along, there is nothing to see here.\n")" + return fi printf "$(gettext " -q, --quiet minimize output\n")" printf "$(gettext " -s, --sign sign database with GnuPG after update\n")" printf "$(gettext " -k, --key <key> use the specified key to sign the database\n")" printf "$(gettext " -v, --verify verify database's signature before update\n")" printf "$(gettext "\n\ -See %s(8) for more details and descriptions of the available options.\n\n")" $cmd +See %s(8) for more details and descriptions of the available options.\n")" $cmd + printf "\n" if [[ $cmd == "repo-add" ]] ; then - echo "$(gettext "Example: repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz")" + printf "$(gettext "Example: repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\n")" elif [[ $cmd == "repo-remove" ]] ; then - echo "$(gettext "Example: repo-remove /path/to/repo.db.tar.gz kernel26")" + printf "$(gettext "Example: repo-remove /path/to/repo.db.tar.gz kernel26\n")" fi } -- 1.7.8.3

1 0

[pacman-dev] [PATCH] Use fileno() in isatty() call
by Dan McGee 12 Jan '12

12 Jan '12

This was our only use of the function that had a hardcoded file descriptor. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/pacman.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 326664d..bce73d2 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -801,7 +801,7 @@ int main(int argc, char *argv[]) config = config_new(); /* disable progressbar if the output is redirected */ - if(!isatty(1)) { + if(!isatty(fileno(stdout))) { config->noprogressbar = 1; } -- 1.7.8.3

3 2

[pacman-dev] [PATCH] Allow UseDelta option to specify a delta ratio
by Dan McGee 12 Jan '12

12 Jan '12

Rework the frontend and backend to allow passing a ratio value in for UseDelta rather than having a hardcoded #define-d 0.7 value always used. This is useful for those with fast connections, who would likely benefit from tuning this ratio to lower values; it is also useful for general testing purposes. The libalpm API changes for this, but we do support the old config file format with a no-value 'UseDelta' option; in this case we simply use the old default of 0.7. We clamp the ratio values to a sane range between 0.0 and 2.0, allowing ratios above 1.0 for testing purposes. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- doc/pacman.conf.5.txt | 10 +++++++--- etc/pacman.conf.in | 2 +- lib/libalpm/alpm.h | 4 ++-- lib/libalpm/delta.c | 3 ++- lib/libalpm/delta.h | 3 --- lib/libalpm/handle.c | 12 ++++++++---- lib/libalpm/handle.h | 2 +- lib/libalpm/sync.c | 4 ++-- src/pacman/conf.c | 19 ++++++++++++++++--- src/pacman/conf.h | 2 +- 10 files changed, 40 insertions(+), 21 deletions(-) diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index 2c1a24b..3913292 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -168,9 +168,13 @@ Options Log action messages through syslog(). This will insert log entries into +{localstatedir}/log/messages+ or equivalent. -*UseDelta*:: - Download delta files instead of complete packages if possible. Requires - the xdelta3 program to be installed. +*UseDelta* [= ratio]:: + Download delta files instead of complete packages if possible. Requires + the `xdelta3` program to be installed. If a ratio is specified (e.g., + `0.5`), then it is used as a cutoff for determining whether to use deltas. + Allowed values are between `0.0` and `2.0`; sensible values are between + `0.2` and `0.9`. Using a value above `1.0` is not recommended. The + default is `0.7` if left unspecified. *TotalDownload*:: When downloading, display the amount downloaded, download rate, ETA, diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in index 932140f..7f9db1b 100644 --- a/etc/pacman.conf.in +++ b/etc/pacman.conf.in @@ -20,6 +20,7 @@ SyncFirst = pacman #XferCommand = /usr/bin/curl -C - -f %u > %o #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #CleanMethod = KeepInstalled +#UseDelta = 0.7 Architecture = auto # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup @@ -31,7 +32,6 @@ Architecture = auto # Misc options #UseSyslog -#UseDelta #TotalDownload CheckSpace #VerbosePkgLists diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 95c817e..9ffdebc 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -535,8 +535,8 @@ const char *alpm_option_get_arch(alpm_handle_t *handle); /** Sets the targeted architecture. */ int alpm_option_set_arch(alpm_handle_t *handle, const char *arch); -int alpm_option_get_usedelta(alpm_handle_t *handle); -int alpm_option_set_usedelta(alpm_handle_t *handle, int usedelta); +double alpm_option_get_deltaratio(alpm_handle_t *handle); +int alpm_option_set_deltaratio(alpm_handle_t *handle, double ratio); int alpm_option_get_checkspace(alpm_handle_t *handle); int alpm_option_set_checkspace(alpm_handle_t *handle, int checkspace); diff --git a/lib/libalpm/delta.c b/lib/libalpm/delta.c index 726f03c..e3acc66 100644 --- a/lib/libalpm/delta.c +++ b/lib/libalpm/delta.c @@ -264,7 +264,8 @@ static alpm_list_t *find_unused(alpm_list_t *deltas, const char *to, off_t quota alpm_list_t SYMEXPORT *alpm_pkg_unused_deltas(alpm_pkg_t *pkg) { ASSERT(pkg != NULL, return NULL); - return find_unused(pkg->deltas, pkg->filename, pkg->size * MAX_DELTA_RATIO); + return find_unused(pkg->deltas, pkg->filename, + pkg->size * pkg->handle->deltaratio); } /** @} */ diff --git a/lib/libalpm/delta.h b/lib/libalpm/delta.h index 1173ddf..37f208b 100644 --- a/lib/libalpm/delta.h +++ b/lib/libalpm/delta.h @@ -30,9 +30,6 @@ alpm_delta_t *_alpm_delta_dup(const alpm_delta_t *delta); off_t _alpm_shortest_delta_path(alpm_handle_t *handle, alpm_list_t *deltas, const char *to, alpm_list_t **path); -/* max percent of package size to download deltas */ -#define MAX_DELTA_RATIO 0.7 - #endif /* _ALPM_DELTA_H */ /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 8e2e3c7..2187dca 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -43,6 +43,7 @@ alpm_handle_t *_alpm_handle_new(void) alpm_handle_t *handle; CALLOC(handle, 1, sizeof(alpm_handle_t), return NULL); + handle->deltaratio = 0.0; return handle; } @@ -252,10 +253,10 @@ const char SYMEXPORT *alpm_option_get_arch(alpm_handle_t *handle) return handle->arch; } -int SYMEXPORT alpm_option_get_usedelta(alpm_handle_t *handle) +double SYMEXPORT alpm_option_get_deltaratio(alpm_handle_t *handle) { CHECK_HANDLE(handle, return -1); - return handle->usedelta; + return handle->deltaratio; } int SYMEXPORT alpm_option_get_checkspace(alpm_handle_t *handle) @@ -597,10 +598,13 @@ int SYMEXPORT alpm_option_set_arch(alpm_handle_t *handle, const char *arch) return 0; } -int SYMEXPORT alpm_option_set_usedelta(alpm_handle_t *handle, int usedelta) +int SYMEXPORT alpm_option_set_deltaratio(alpm_handle_t *handle, double ratio) { CHECK_HANDLE(handle, return -1); - handle->usedelta = usedelta; + if(ratio < 0.0 || ratio > 2.0) { + RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1); + } + handle->deltaratio = ratio; return 0; } diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index a64c5c9..a090ae4 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -88,8 +88,8 @@ struct __alpm_handle_t { /* options */ char *arch; /* Architecture of packages we should allow */ + double deltaratio; /* Download deltas if possible; a ratio value */ int usesyslog; /* Use syslog instead of logfile? */ /* TODO move to frontend */ - int usedelta; /* Download deltas if possible */ int checkspace; /* Check disk space before installing */ alpm_siglevel_t siglevel; /* Default signature verification level */ diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 49a3f42..6967b49 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -318,13 +318,13 @@ static int compute_download_size(alpm_pkg_t *newpkg) /* tell the caller that we have a partial */ ret = 1; - } else if(handle->usedelta) { + } else if(handle->deltaratio > 0.0) { off_t dltsize; dltsize = _alpm_shortest_delta_path(handle, newpkg->deltas, newpkg->filename, &newpkg->delta_path); - if(newpkg->delta_path && (dltsize < newpkg->size * MAX_DELTA_RATIO)) { + if(newpkg->delta_path && (dltsize < newpkg->size * handle->deltaratio)) { _alpm_log(handle, ALPM_LOG_DEBUG, "using delta size\n"); size = dltsize; } else { diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 7ba2791..e1bff18 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -52,6 +52,7 @@ config_t *config_new(void) newconfig->op = PM_OP_MAIN; newconfig->logmask = ALPM_LOG_ERROR | ALPM_LOG_WARNING; newconfig->configfile = strdup(CONFFILE); + newconfig->deltaratio = 0.0; if(alpm_capabilities() & ALPM_CAPABILITY_SIGNATURES) { newconfig->siglevel = ALPM_SIG_PACKAGE | ALPM_SIG_PACKAGE_OPTIONAL | ALPM_SIG_DATABASE | ALPM_SIG_DATABASE_OPTIONAL; @@ -397,8 +398,8 @@ static int _parse_options(const char *key, char *value, config->verbosepkglists = 1; pm_printf(ALPM_LOG_DEBUG, "config: verbosepkglists\n"); } else if(strcmp(key, "UseDelta") == 0) { - config->usedelta = 1; - pm_printf(ALPM_LOG_DEBUG, "config: usedelta\n"); + config->deltaratio = 0.7; + pm_printf(ALPM_LOG_DEBUG, "config: usedelta (default 0.7)\n"); } else if(strcmp(key, "TotalDownload") == 0) { config->totaldownload = 1; pm_printf(ALPM_LOG_DEBUG, "config: totaldownload\n"); @@ -429,6 +430,18 @@ static int _parse_options(const char *key, char *value, if(!config->arch) { config_set_arch(value); } + } else if(strcmp(key, "UseDelta") == 0) { + double ratio; + char *endptr; + ratio = strtod(value, &endptr); + if(*endptr != '\0' || ratio < 0.0 || ratio > 2.0) { + pm_printf(ALPM_LOG_ERROR, + _("config file %s, line %d: invalid value for '%s' : '%s'\n"), + file, linenum, "UseDelta", value); + return 1; + } + config->deltaratio = ratio; + pm_printf(ALPM_LOG_DEBUG, "config: usedelta = %f\n", ratio); } else if(strcmp(key, "DBPath") == 0) { /* don't overwrite a path specified on the command line */ if(!config->dbpath) { @@ -605,7 +618,7 @@ static int setup_libalpm(void) alpm_option_set_arch(handle, config->arch); alpm_option_set_checkspace(handle, config->checkspace); alpm_option_set_usesyslog(handle, config->usesyslog); - alpm_option_set_usedelta(handle, config->usedelta); + alpm_option_set_deltaratio(handle, config->deltaratio); alpm_option_set_ignorepkgs(handle, config->ignorepkg); alpm_option_set_ignoregroups(handle, config->ignoregrp); diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 325fbb6..481132f 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -34,7 +34,7 @@ typedef struct __config_t { unsigned short print; unsigned short checkspace; unsigned short usesyslog; - unsigned short usedelta; + double deltaratio; char *arch; char *print_format; /* unfortunately, we have to keep track of paths both here and in the library -- 1.7.8.3

3 2