- Pacman-dev - lists.archlinux.org

[pacman-dev] CVS update of pacman-lib (12 files)
by Dan McGee 06 Mar '07

06 Mar '07

Date: Tuesday, March 6, 2007 @ 01:38:21 Author: dan Path: /home/cvs-pacman/pacman-lib Added: INSTALL (1.1) acinclude.m4 (1.1) config.guess (1.1) config.sub (1.1) depcomp (1.1) install-sh (1.1) ltmain.sh (1.1) missing (1.1) mkinstalldirs (1.1) Modified: autoclean.sh (1.10 -> 1.11) autogen.sh (1.5 -> 1.6) config.rpath (1.2 -> 1.3) Trying to fix up this autotools stuff a bit more. * Greatly simplify and de-obfuscate the autogen and autoclean code. * Add a bunch of the autotools required files to the repository. This will give us consistency (a novel idea) across all builds, and allow for much more recent versions of config.guess and config.sub to be used. ---------------+ INSTALL | 234 + acinclude.m4 | 6397 ++++++++++++++++++++++++++++++++++++++++++++++++++++ autoclean.sh | 54 autogen.sh | 55 config.guess | 1516 ++++++++++++ config.rpath | 614 +++++ config.sub | 1622 +++++++++++++ depcomp | 584 ++++ install-sh | 507 ++++ ltmain.sh | 6863 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ missing | 367 ++ mkinstalldirs | 161 + 12 files changed, 18887 insertions(+), 87 deletions(-) The diff is longer than the limit of 39KB.

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (md5driver.c server.c sha1.c)
by Aaron Griffin 06 Mar '07

06 Mar '07

Date: Monday, March 5, 2007 @ 23:22:04 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: md5driver.c (1.7 -> 1.8) server.c (1.24 -> 1.25) sha1.c (1.6 -> 1.7) * Fix the double package name URL when using XferCommand * Fixed valgrind yelling about the sprintfs in md5/sha1 routines -------------+ md5driver.c | 6 ++++-- server.c | 12 +++++------- sha1.c | 4 +++- 3 files changed, 12 insertions(+), 10 deletions(-) Index: pacman-lib/lib/libalpm/md5driver.c diff -u pacman-lib/lib/libalpm/md5driver.c:1.7 pacman-lib/lib/libalpm/md5driver.c:1.8 --- pacman-lib/lib/libalpm/md5driver.c:1.7 Mon Mar 5 17:13:34 2007 +++ pacman-lib/lib/libalpm/md5driver.c Mon Mar 5 23:22:03 2007 @@ -47,6 +47,7 @@ FILE *file; MD_CTX context; int len; + char hex[3]; unsigned char buffer[1024], digest[16]; ALPM_LOG_FUNC; @@ -66,10 +67,11 @@ ret = calloc(33, sizeof(char)); for(i = 0; i < 16; i++) { - sprintf(ret+(i*2), "%02x", digest[i]); + snprintf(hex, 3, "%02x", digest[i]); + strncat(ret, hex, 2); } - _alpm_log(PM_LOG_DEBUG, _("sha1(%s) = %s"), filename, ret); + _alpm_log(PM_LOG_DEBUG, _("md5(%s) = %s"), filename, ret); return(ret); } return(NULL); Index: pacman-lib/lib/libalpm/server.c diff -u pacman-lib/lib/libalpm/server.c:1.24 pacman-lib/lib/libalpm/server.c:1.25 --- pacman-lib/lib/libalpm/server.c:1.24 Mon Mar 5 20:21:41 2007 +++ pacman-lib/lib/libalpm/server.c Mon Mar 5 23:22:03 2007 @@ -319,8 +319,10 @@ char parsedCmd[PATH_MAX] = ""; char url[PATH_MAX]; char cwd[PATH_MAX]; + /* build the full download url */ - snprintf(url, PATH_MAX, "%s://%s%s/%s", fileurl->scheme, fileurl->host, fileurl->doc, fn); + snprintf(url, PATH_MAX, "%s://%s%s", fileurl->scheme, fileurl->host, fileurl->doc); + /* replace all occurrences of %o with fn.part */ strncpy(origCmd, handle->xfercommand, sizeof(origCmd)); ptr1 = origCmd; @@ -328,8 +330,7 @@ usepart = 1; ptr2[0] = '\0'; strcat(parsedCmd, ptr1); - strcat(parsedCmd, fn); - strcat(parsedCmd, ".part"); + strcat(parsedCmd, output); ptr1 = ptr2 + 2; } strcat(parsedCmd, ptr1); @@ -363,10 +364,7 @@ /* download was successful */ complete = alpm_list_add(complete, fn); if(usepart) { - char fnpart[PATH_MAX]; - /* rename "output.part" file to "output" file */ - snprintf(fnpart, PATH_MAX, "%s.part", fn); - rename(fnpart, fn); + rename(output, realfile); } } chdir(cwd); Index: pacman-lib/lib/libalpm/sha1.c diff -u pacman-lib/lib/libalpm/sha1.c:1.6 pacman-lib/lib/libalpm/sha1.c:1.7 --- pacman-lib/lib/libalpm/sha1.c:1.6 Mon Mar 5 17:13:34 2007 +++ pacman-lib/lib/libalpm/sha1.c Mon Mar 5 23:22:03 2007 @@ -387,6 +387,7 @@ FILE *file; struct sha_ctx context; int len, i; + char hex[3]; unsigned char buffer[1024], digest[20]; char *ret; @@ -405,7 +406,8 @@ ret = (char*)malloc(41); ret[0] = '\0'; for(i = 0; i < 20; i++) { - sprintf(ret+(i*2), "%02x", digest[i]); + snprintf(hex, 3, "%02x", digest[i]); + strncat(ret, hex, 2); } _alpm_log(PM_LOG_DEBUG, _("sha1(%s) = %s"), filename, ret); return(ret);

1 0

[pacman-dev] CVS update of pacman-lib (19 files)
by Dan McGee 06 Mar '07

06 Mar '07

Date: Monday, March 5, 2007 @ 20:21:42 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: lib/libalpm/alpm.c (1.125 -> 1.126) lib/libalpm/alpm.h (1.79 -> 1.80) lib/libalpm/md5.h (1.3 -> 1.4) lib/libalpm/server.c (1.23 -> 1.24) lib/libalpm/sha1.h (1.3 -> 1.4) lib/libalpm/trans.c (1.42 -> 1.43) lib/libalpm/trans.h (1.24 -> 1.25) lib/libalpm/versioncmp.h (1.8 -> 1.9) src/pacman/add.h (1.3 -> 1.4) src/pacman/conf.h (1.16 -> 1.17) src/pacman/deptest.h (1.2 -> 1.3) src/pacman/log.h (1.7 -> 1.8) src/pacman/package.h (1.6 -> 1.7) src/pacman/query.h (1.3 -> 1.4) src/pacman/remove.h (1.3 -> 1.4) src/pacman/sync.h (1.5 -> 1.6) src/pacman/trans.h (1.9 -> 1.10) src/pacman/upgrade.h (1.3 -> 1.4) src/pacman/util.h (1.16 -> 1.17) * Added missing header include guards in md5.h and sha1.h. * Some header cleanup on the pacman side of things - we had alpm.h instead alpm_list.h in a few headers. * removed an extra slash in path-building snprintf in server.c. --------------------------+ lib/libalpm/alpm.c | 2 +- lib/libalpm/alpm.h | 2 +- lib/libalpm/md5.h | 7 +++++-- lib/libalpm/server.c | 4 ++-- lib/libalpm/sha1.h | 4 ++++ lib/libalpm/trans.c | 2 +- lib/libalpm/trans.h | 4 ++-- lib/libalpm/versioncmp.h | 6 +++--- src/pacman/add.h | 2 +- src/pacman/conf.h | 2 +- src/pacman/deptest.h | 2 +- src/pacman/log.h | 2 ++ src/pacman/package.h | 2 ++ src/pacman/query.h | 2 +- src/pacman/remove.h | 2 +- src/pacman/sync.h | 2 +- src/pacman/trans.h | 2 ++ src/pacman/upgrade.h | 2 +- src/pacman/util.h | 1 - 19 files changed, 32 insertions(+), 20 deletions(-) Index: pacman-lib/lib/libalpm/alpm.c diff -u pacman-lib/lib/libalpm/alpm.c:1.125 pacman-lib/lib/libalpm/alpm.c:1.126 --- pacman-lib/lib/libalpm/alpm.c:1.125 Mon Mar 5 17:13:33 2007 +++ pacman-lib/lib/libalpm/alpm.c Mon Mar 5 20:21:41 2007 @@ -634,7 +634,7 @@ * @param progress progress callback function pointer * @return 0 on success, -1 on error (pm_errno is set accordingly) */ -int SYMEXPORT alpm_trans_init(pmtranstype_t type, unsigned int flags, +int SYMEXPORT alpm_trans_init(pmtranstype_t type, pmtransflag_t flags, alpm_trans_cb_event event, alpm_trans_cb_conv conv, alpm_trans_cb_progress progress) { Index: pacman-lib/lib/libalpm/alpm.h diff -u pacman-lib/lib/libalpm/alpm.h:1.79 pacman-lib/lib/libalpm/alpm.h:1.80 --- pacman-lib/lib/libalpm/alpm.h:1.79 Sat Mar 3 03:13:59 2007 +++ pacman-lib/lib/libalpm/alpm.h Mon Mar 5 20:21:41 2007 @@ -349,7 +349,7 @@ unsigned int alpm_trans_get_flags(); alpm_list_t * alpm_trans_get_targets(); alpm_list_t * alpm_trans_get_pkgs(); -int alpm_trans_init(pmtranstype_t type, unsigned int flags, +int alpm_trans_init(pmtranstype_t type, pmtransflag_t flags, alpm_trans_cb_event cb_event, alpm_trans_cb_conv conv, alpm_trans_cb_progress cb_progress); int alpm_trans_sysupgrade(void); Index: pacman-lib/lib/libalpm/md5.h diff -u pacman-lib/lib/libalpm/md5.h:1.3 pacman-lib/lib/libalpm/md5.h:1.4 --- pacman-lib/lib/libalpm/md5.h:1.3 Sun Oct 15 15:31:05 2006 +++ pacman-lib/lib/libalpm/md5.h Mon Mar 5 20:21:41 2007 @@ -20,8 +20,9 @@ without express or implied warranty of any kind. These notices must be retained in any copies of any part of this -documentation and/or software. - */ +documentation and/or software. */ +#ifndef _ALPM_MD5_H +#define _ALPM_MD5_H /* POINTER defines a generic pointer type */ typedef unsigned char *POINTER; @@ -47,4 +48,6 @@ char* _alpm_MDFile(char *); void _alpm_MDPrint(unsigned char [16]); +#endif /* _ALPM_MD5_H */ + /* vim: set ts=2 sw=2 noet: */ Index: pacman-lib/lib/libalpm/server.c diff -u pacman-lib/lib/libalpm/server.c:1.23 pacman-lib/lib/libalpm/server.c:1.24 --- pacman-lib/lib/libalpm/server.c:1.23 Mon Mar 5 17:13:34 2007 +++ pacman-lib/lib/libalpm/server.c Mon Mar 5 20:21:41 2007 @@ -203,8 +203,8 @@ } _alpm_log(PM_LOG_DEBUG, _("using '%s' for download progress"), pkgname); - snprintf(realfile, PATH_MAX, "%s/%s", localpath, fn); - snprintf(output, PATH_MAX, "%s/%s.part", localpath, fn); + snprintf(realfile, PATH_MAX, "%s%s", localpath, fn); + snprintf(output, PATH_MAX, "%s%s.part", localpath, fn); if(alpm_list_find_str(complete, fn)) { continue; Index: pacman-lib/lib/libalpm/sha1.h diff -u pacman-lib/lib/libalpm/sha1.h:1.3 pacman-lib/lib/libalpm/sha1.h:1.4 --- pacman-lib/lib/libalpm/sha1.h:1.3 Thu Jan 18 11:53:01 2007 +++ pacman-lib/lib/libalpm/sha1.h Mon Mar 5 20:21:41 2007 @@ -15,6 +15,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef _ALPM_SHA1_H +#define _ALPM_SHA1_H #include <stdio.h> #include <limits.h> @@ -65,4 +67,6 @@ /* Needed for pacman */ char *_alpm_SHAFile (char *); +#endif /* _ALPM_SHA1_H */ + /* vim: set ts=2 sw=2 noet: */ Index: pacman-lib/lib/libalpm/trans.c diff -u pacman-lib/lib/libalpm/trans.c:1.42 pacman-lib/lib/libalpm/trans.c:1.43 --- pacman-lib/lib/libalpm/trans.c:1.42 Mon Mar 5 17:13:34 2007 +++ pacman-lib/lib/libalpm/trans.c Mon Mar 5 20:21:42 2007 @@ -97,7 +97,7 @@ FREE(trans); } -int _alpm_trans_init(pmtrans_t *trans, pmtranstype_t type, unsigned int flags, +int _alpm_trans_init(pmtrans_t *trans, pmtranstype_t type, pmtransflag_t flags, alpm_trans_cb_event event, alpm_trans_cb_conv conv, alpm_trans_cb_progress progress) { Index: pacman-lib/lib/libalpm/trans.h diff -u pacman-lib/lib/libalpm/trans.h:1.24 pacman-lib/lib/libalpm/trans.h:1.25 --- pacman-lib/lib/libalpm/trans.h:1.24 Mon Feb 19 21:14:27 2007 +++ pacman-lib/lib/libalpm/trans.h Mon Mar 5 20:21:42 2007 @@ -39,7 +39,7 @@ /* Transaction */ struct __pmtrans_t { pmtranstype_t type; - unsigned int flags; + pmtransflag_t flags; pmtransstate_t state; alpm_list_t *targets; /* list of (char *) */ alpm_list_t *packages; /* list of (pmpkg_t *) or (pmsyncpkg_t *) */ @@ -78,7 +78,7 @@ pmtrans_t *_alpm_trans_new(void); void _alpm_trans_free(void *data); -int _alpm_trans_init(pmtrans_t *trans, pmtranstype_t type, unsigned int flags, +int _alpm_trans_init(pmtrans_t *trans, pmtranstype_t type, pmtransflag_t flags, alpm_trans_cb_event event, alpm_trans_cb_conv conv, alpm_trans_cb_progress progress); int _alpm_trans_sysupgrade(pmtrans_t *trans); Index: pacman-lib/lib/libalpm/versioncmp.h diff -u pacman-lib/lib/libalpm/versioncmp.h:1.8 pacman-lib/lib/libalpm/versioncmp.h:1.9 --- pacman-lib/lib/libalpm/versioncmp.h:1.8 Fri Feb 9 16:54:57 2007 +++ pacman-lib/lib/libalpm/versioncmp.h Mon Mar 5 20:21:42 2007 @@ -20,8 +20,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ -#ifndef _PM_RPMVERCMP_H -#define _PM_RPMVERCMP_H +#ifndef _ALPM_VERSIONCMP_H +#define _ALPM_VERSIONCMP_H #include "deps.h" #include "package.h" @@ -30,6 +30,6 @@ int _alpm_versioncmp(const char *a, const char *b); -#endif +#endif /* _ALPM_VERSIONCMP_H */ /* vim: set ts=2 sw=2 noet: */ Index: pacman-lib/src/pacman/add.h diff -u pacman-lib/src/pacman/add.h:1.3 pacman-lib/src/pacman/add.h:1.4 --- pacman-lib/src/pacman/add.h:1.3 Fri Jan 19 04:28:46 2007 +++ pacman-lib/src/pacman/add.h Mon Mar 5 20:21:42 2007 @@ -21,7 +21,7 @@ #ifndef _PM_ADD_H #define _PM_ADD_H -#include <alpm.h> +#include <alpm_list.h> int pacman_add(alpm_list_t *targets); Index: pacman-lib/src/pacman/conf.h diff -u pacman-lib/src/pacman/conf.h:1.16 pacman-lib/src/pacman/conf.h:1.17 --- pacman-lib/src/pacman/conf.h:1.16 Mon Feb 12 01:44:00 2007 +++ pacman-lib/src/pacman/conf.h Mon Mar 5 20:21:42 2007 @@ -51,7 +51,7 @@ unsigned short op_s_search; unsigned short op_s_upgrade; unsigned short group; - unsigned int flags; + pmtransflag_t flags; unsigned short noask; unsigned int ask; } config_t; Index: pacman-lib/src/pacman/deptest.h diff -u pacman-lib/src/pacman/deptest.h:1.2 pacman-lib/src/pacman/deptest.h:1.3 --- pacman-lib/src/pacman/deptest.h:1.2 Fri Jan 19 04:28:46 2007 +++ pacman-lib/src/pacman/deptest.h Mon Mar 5 20:21:42 2007 @@ -21,7 +21,7 @@ #ifndef _PM_DEPTEST_H #define _PM_DEPTEST_H -#include <alpm.h> +#include <alpm_list.h> int pacman_deptest(alpm_list_t *targets); Index: pacman-lib/src/pacman/log.h diff -u pacman-lib/src/pacman/log.h:1.7 pacman-lib/src/pacman/log.h:1.8 --- pacman-lib/src/pacman/log.h:1.7 Wed Feb 21 23:36:03 2007 +++ pacman-lib/src/pacman/log.h Mon Mar 5 20:21:42 2007 @@ -21,6 +21,8 @@ #ifndef _PM_LOG_H #define _PM_LOG_H +#include <stdio.h> + /* TODO these are illegal in ISO C, thus the reason -pedantic was never used * as a compile flag for the pacman side of things (named variadic macros) */ #define MSG(line, fmt, args...) pm_fprintf(stdout, line, fmt, ##args) Index: pacman-lib/src/pacman/package.h diff -u pacman-lib/src/pacman/package.h:1.6 pacman-lib/src/pacman/package.h:1.7 --- pacman-lib/src/pacman/package.h:1.6 Fri Jan 19 04:28:46 2007 +++ pacman-lib/src/pacman/package.h Mon Mar 5 20:21:42 2007 @@ -21,6 +21,8 @@ #ifndef _PM_PACKAGE_H #define _PM_PACKAGE_H +#include <alpm.h> + void dump_pkg_full(pmpkg_t *pkg, int level); void dump_pkg_sync(pmpkg_t *pkg, const char *treename); Index: pacman-lib/src/pacman/query.h diff -u pacman-lib/src/pacman/query.h:1.3 pacman-lib/src/pacman/query.h:1.4 --- pacman-lib/src/pacman/query.h:1.3 Fri Jan 19 04:28:46 2007 +++ pacman-lib/src/pacman/query.h Mon Mar 5 20:21:42 2007 @@ -21,7 +21,7 @@ #ifndef _PM_QUERY_H #define _PM_QUERY_H -#include <alpm.h> +#include <alpm_list.h> int pacman_query(alpm_list_t *targets); Index: pacman-lib/src/pacman/remove.h diff -u pacman-lib/src/pacman/remove.h:1.3 pacman-lib/src/pacman/remove.h:1.4 --- pacman-lib/src/pacman/remove.h:1.3 Fri Jan 19 04:28:46 2007 +++ pacman-lib/src/pacman/remove.h Mon Mar 5 20:21:42 2007 @@ -21,7 +21,7 @@ #ifndef _PM_REMOVE_H #define _PM_REMOVE_H -#include <alpm.h> +#include <alpm_list.h> int pacman_remove(alpm_list_t *targets); Index: pacman-lib/src/pacman/sync.h diff -u pacman-lib/src/pacman/sync.h:1.5 pacman-lib/src/pacman/sync.h:1.6 --- pacman-lib/src/pacman/sync.h:1.5 Fri Jan 19 04:28:46 2007 +++ pacman-lib/src/pacman/sync.h Mon Mar 5 20:21:42 2007 @@ -21,7 +21,7 @@ #ifndef _PM_SYNC_H #define _PM_SYNC_H -#include <alpm.h> +#include <alpm_list.h> int pacman_sync(alpm_list_t *targets); Index: pacman-lib/src/pacman/trans.h diff -u pacman-lib/src/pacman/trans.h:1.9 pacman-lib/src/pacman/trans.h:1.10 --- pacman-lib/src/pacman/trans.h:1.9 Sat Mar 3 03:14:00 2007 +++ pacman-lib/src/pacman/trans.h Mon Mar 5 20:21:42 2007 @@ -21,6 +21,8 @@ #ifndef _PM_TRANS_H #define _PM_TRANS_H +#include <alpm.h> + /* callback to handle messages/notifications from pacman transactions */ void cb_trans_evt(pmtransevt_t event, void *data1, void *data2); Index: pacman-lib/src/pacman/upgrade.h diff -u pacman-lib/src/pacman/upgrade.h:1.3 pacman-lib/src/pacman/upgrade.h:1.4 --- pacman-lib/src/pacman/upgrade.h:1.3 Fri Jan 19 04:28:47 2007 +++ pacman-lib/src/pacman/upgrade.h Mon Mar 5 20:21:42 2007 @@ -21,7 +21,7 @@ #ifndef _PM_UPGRADE_H #define _PM_UPGRADE_H -#include <alpm.h> +#include <alpm_list.h> int pacman_upgrade(alpm_list_t *targets); Index: pacman-lib/src/pacman/util.h diff -u pacman-lib/src/pacman/util.h:1.16 pacman-lib/src/pacman/util.h:1.17 --- pacman-lib/src/pacman/util.h:1.16 Sun Feb 4 03:26:53 2007 +++ pacman-lib/src/pacman/util.h Mon Mar 5 20:21:42 2007 @@ -25,7 +25,6 @@ #include <string.h> #include <libintl.h> -#include <alpm.h> #include <alpm_list.h> #define MALLOC(p, b) do { \

1 0

[pacman-dev] CVS update of pacman-lib (43 files)
by Dan McGee 05 Mar '07

05 Mar '07

Date: Monday, March 5, 2007 @ 17:13:35 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: HACKING (1.2 -> 1.3) lib/libalpm/add.c (1.124 -> 1.125) lib/libalpm/alpm.c (1.124 -> 1.125) lib/libalpm/alpm_list.c (1.9 -> 1.10) lib/libalpm/backup.c (1.11 -> 1.12) lib/libalpm/be_files.c (1.35 -> 1.36) lib/libalpm/cache.c (1.37 -> 1.38) lib/libalpm/conflict.c (1.45 -> 1.46) lib/libalpm/conflict.h (1.12 -> 1.13) lib/libalpm/db.c (1.65 -> 1.66) lib/libalpm/deps.c (1.75 -> 1.76) lib/libalpm/error.c (1.18 -> 1.19) lib/libalpm/group.c (1.15 -> 1.16) lib/libalpm/handle.c (1.36 -> 1.37) lib/libalpm/handle.h (1.16 -> 1.17) lib/libalpm/log.c (1.9 -> 1.10) lib/libalpm/md5.c (1.3 -> 1.4) lib/libalpm/md5driver.c (1.6 -> 1.7) lib/libalpm/package.c (1.83 -> 1.84) lib/libalpm/provide.c (1.13 -> 1.14) lib/libalpm/remove.c (1.73 -> 1.74) lib/libalpm/server.c (1.22 -> 1.23) lib/libalpm/sha1.c (1.5 -> 1.6) lib/libalpm/sync.c (1.109 -> 1.110) lib/libalpm/trans.c (1.41 -> 1.42) lib/libalpm/util.c (1.48 -> 1.49) lib/libalpm/versioncmp.c (1.16 -> 1.17) pactest/util.py (1.5 -> 1.6) src/pacman/add.c (1.33 -> 1.34) src/pacman/conf.c (1.22 -> 1.23) src/pacman/deptest.c (1.15 -> 1.16) src/pacman/downloadprog.c (1.15 -> 1.16) src/pacman/log.c (1.31 -> 1.32) src/pacman/package.c (1.32 -> 1.33) src/pacman/pacman.c (1.103 -> 1.104) src/pacman/query.c (1.26 -> 1.27) src/pacman/remove.c (1.29 -> 1.30) src/pacman/sync.c (1.115 -> 1.116) src/pacman/trans.c (1.41 -> 1.42) src/pacman/upgrade.c (1.6 -> 1.7) src/pacman/util.c (1.30 -> 1.31) src/util/testpkg.c (1.1 -> 1.2) src/util/vercmp.c (1.7 -> 1.8) This commit looks much more monumental than it is. Almost all just #include reordering and adding ones that were forgotten (noticed when trying to compile after reordering). * Updated the HACKING file to include information on #include usage. * print -> vprint in "making dir" function in pactest. ---------------------------+ HACKING | 34 ++++++++++++++++++++++++++++++++-- lib/libalpm/add.c | 6 ++++-- lib/libalpm/alpm.c | 10 ++++++---- lib/libalpm/alpm_list.c | 3 ++- lib/libalpm/backup.c | 7 +++++-- lib/libalpm/be_files.c | 7 +++++-- lib/libalpm/cache.c | 8 +++++--- lib/libalpm/conflict.c | 15 ++++++++------- lib/libalpm/conflict.h | 3 ++- lib/libalpm/db.c | 16 +++++++++------- lib/libalpm/deps.c | 9 ++++++--- lib/libalpm/error.c | 6 ++++++ lib/libalpm/group.c | 8 +++++--- lib/libalpm/handle.c | 8 +++++--- lib/libalpm/handle.h | 4 +++- lib/libalpm/log.c | 6 ++++-- lib/libalpm/md5.c | 1 + lib/libalpm/md5driver.c | 4 ++++ lib/libalpm/package.c | 6 ++++-- lib/libalpm/provide.c | 8 +++++--- lib/libalpm/remove.c | 19 ++++++++++--------- lib/libalpm/server.c | 5 ++++- lib/libalpm/sha1.c | 16 +++++++--------- lib/libalpm/sync.c | 8 +++++--- lib/libalpm/trans.c | 7 +++++-- lib/libalpm/util.c | 18 +++++++++--------- lib/libalpm/versioncmp.c | 8 +++++--- pactest/util.py | 2 +- src/pacman/add.c | 5 ++++- src/pacman/conf.c | 5 ++++- src/pacman/deptest.c | 4 +++- src/pacman/downloadprog.c | 4 +++- src/pacman/log.c | 2 ++ src/pacman/package.c | 5 ++++- src/pacman/pacman.c | 2 ++ src/pacman/query.c | 5 ++++- src/pacman/remove.c | 5 ++++- src/pacman/sync.c | 12 ++++++------ src/pacman/trans.c | 4 +++- src/pacman/upgrade.c | 7 ++++--- src/pacman/util.c | 5 +++-- src/util/testpkg.c | 2 ++ src/util/vercmp.c | 4 ++++ 43 files changed, 219 insertions(+), 104 deletions(-) Index: pacman-lib/HACKING diff -u pacman-lib/HACKING:1.2 pacman-lib/HACKING:1.3 --- pacman-lib/HACKING:1.2 Mon Feb 26 04:19:33 2007 +++ pacman-lib/HACKING Mon Mar 5 17:13:33 2007 @@ -1,8 +1,8 @@ Contributing to pacman ====================== -Please read 'submitting-patches' and 'translation-help' in the same directory as -this file. +Please read 'submitting-patches' and 'translation-help' in the same directory +as this file. Coding style ------------ @@ -62,4 +62,34 @@ NOT sizeof(*mylist); +Other Concerns +-------------- + +Currently our #include usage is in messy shape, but this is no reason to +continue down this messy path. When adding an include to a file, follow this +general pattern, including blank lines: + +#include "config.h" + +#include <standardheader.h> +#include <another.h> +#include <...> + +Follow this with some more headers, depending on whether the file is in libalpm +or pacman proper. For libalpm: + +/* libalpm */ +#include "yourfile.h" +#include "alpm_list.h" +#include "anythingelse.h" + +For pacman: + +#include <alpm.h> +#include <alpm_list.h> + +/* pacman */ +#include "yourfile.h" +#include "anythingelse.h" + vim: set ts=2 sw=2 et: Index: pacman-lib/lib/libalpm/add.c diff -u pacman-lib/lib/libalpm/add.c:1.124 pacman-lib/lib/libalpm/add.c:1.125 --- pacman-lib/lib/libalpm/add.c:1.124 Sun Mar 4 04:08:54 2007 +++ pacman-lib/lib/libalpm/add.c Mon Mar 5 17:13:33 2007 @@ -31,6 +31,7 @@ #endif #include "config.h" + #include <stdlib.h> #include <errno.h> #include <time.h> @@ -38,7 +39,9 @@ #include <string.h> #include <limits.h> #include <libintl.h> -/* pacman */ + +/* libalpm */ +#include "add.h" #include "alpm_list.h" #include "trans.h" #include "util.h" @@ -54,7 +57,6 @@ #include "provide.h" #include "conflict.h" #include "deps.h" -#include "add.h" #include "remove.h" #include "handle.h" Index: pacman-lib/lib/libalpm/alpm.c diff -u pacman-lib/lib/libalpm/alpm.c:1.124 pacman-lib/lib/libalpm/alpm.c:1.125 --- pacman-lib/lib/libalpm/alpm.c:1.124 Mon Mar 5 14:21:33 2007 +++ pacman-lib/lib/libalpm/alpm.c Mon Mar 5 17:13:33 2007 @@ -22,6 +22,8 @@ * USA. */ +#include "config.h" + #include <stdio.h> #include <stdlib.h> #include <errno.h> @@ -36,14 +38,15 @@ #include <limits.h> /* PATH_MAX */ #include <stdarg.h> #include <libintl.h> -/* pacman */ -#include "config.h" + +/* libalpm */ +#include "alpm.h" +#include "alpm_list.h" #include "log.h" #include "error.h" #include "versioncmp.h" #include "md5.h" #include "sha1.h" -#include "alpm_list.h" #include "package.h" #include "group.h" #include "util.h" @@ -58,7 +61,6 @@ #include "handle.h" #include "provide.h" #include "server.h" -#include "alpm.h" #define min(X, Y) ((X) < (Y) ? (X) : (Y)) Index: pacman-lib/lib/libalpm/alpm_list.c diff -u pacman-lib/lib/libalpm/alpm_list.c:1.9 pacman-lib/lib/libalpm/alpm_list.c:1.10 --- pacman-lib/lib/libalpm/alpm_list.c:1.9 Sat Mar 3 03:13:59 2007 +++ pacman-lib/lib/libalpm/alpm_list.c Mon Mar 5 17:13:33 2007 @@ -20,11 +20,12 @@ */ #include "config.h" + #include <stdlib.h> #include <string.h> #include <stdio.h> -#include <assert.h> +/* libalpm */ #include "alpm_list.h" #include "util.h" Index: pacman-lib/lib/libalpm/backup.c diff -u pacman-lib/lib/libalpm/backup.c:1.11 pacman-lib/lib/libalpm/backup.c:1.12 --- pacman-lib/lib/libalpm/backup.c:1.11 Sat Feb 17 03:55:06 2007 +++ pacman-lib/lib/libalpm/backup.c Mon Mar 5 17:13:33 2007 @@ -23,11 +23,14 @@ */ #include "config.h" + #include <stdlib.h> #include <string.h> -/* pacman */ -#include "log.h" + +/* libalpm */ #include "backup.h" +#include "alpm_list.h" +#include "log.h" #include "util.h" /* Look for a filename in a pmpkg_t.backup list. If we find it, Index: pacman-lib/lib/libalpm/be_files.c diff -u pacman-lib/lib/libalpm/be_files.c:1.35 pacman-lib/lib/libalpm/be_files.c:1.36 --- pacman-lib/lib/libalpm/be_files.c:1.35 Sun Mar 4 04:08:54 2007 +++ pacman-lib/lib/libalpm/be_files.c Mon Mar 5 17:13:33 2007 @@ -21,6 +21,7 @@ */ #include "config.h" + #include <unistd.h> #include <stdio.h> #include <stdlib.h> @@ -36,10 +37,12 @@ #ifdef CYGWIN #include <limits.h> /* PATH_MAX */ #endif -/* pacman */ + +/* libalpm */ +#include "db.h" +#include "alpm_list.h" #include "log.h" #include "util.h" -#include "db.h" #include "alpm.h" #include "error.h" #include "handle.h" Index: pacman-lib/lib/libalpm/cache.c diff -u pacman-lib/lib/libalpm/cache.c:1.37 pacman-lib/lib/libalpm/cache.c:1.38 --- pacman-lib/lib/libalpm/cache.c:1.37 Sat Mar 3 03:13:59 2007 +++ pacman-lib/lib/libalpm/cache.c Mon Mar 5 17:13:33 2007 @@ -20,6 +20,7 @@ */ #include "config.h" + #include <unistd.h> #include <stdio.h> #include <stdlib.h> @@ -27,16 +28,17 @@ #include <string.h> #include <sys/stat.h> #include <libintl.h> -/* pacman */ + +/* libalpm */ +#include "cache.h" +#include "alpm_list.h" #include "log.h" #include "alpm.h" -#include "alpm_list.h" #include "util.h" #include "error.h" #include "package.h" #include "group.h" #include "db.h" -#include "cache.h" /* Returns a new package cache from db. * It frees the cache if it already exists. Index: pacman-lib/lib/libalpm/conflict.c diff -u pacman-lib/lib/libalpm/conflict.c:1.45 pacman-lib/lib/libalpm/conflict.c:1.46 --- pacman-lib/lib/libalpm/conflict.c:1.45 Sat Mar 3 15:22:48 2007 +++ pacman-lib/lib/libalpm/conflict.c Mon Mar 5 17:13:33 2007 @@ -23,28 +23,29 @@ * USA. */ -#if defined(__APPLE__) || defined(__OpenBSD__) -#include <sys/syslimits.h> -#endif - #include "config.h" + #include <stdlib.h> #include <stdio.h> #include <unistd.h> #include <string.h> #include <limits.h> +#if defined(__APPLE__) || defined(__OpenBSD__) +#include <sys/syslimits.h> +#endif #include <sys/stat.h> #include <libintl.h> -/* pacman */ -#include "handle.h" + +/* libalpm */ +#include "conflict.h" #include "alpm_list.h" +#include "handle.h" #include "trans.h" #include "util.h" #include "error.h" #include "log.h" #include "cache.h" #include "deps.h" -#include "conflict.h" /** See if potential conflict 'name' matches package 'pkg'. Index: pacman-lib/lib/libalpm/conflict.h diff -u pacman-lib/lib/libalpm/conflict.h:1.12 pacman-lib/lib/libalpm/conflict.h:1.13 --- pacman-lib/lib/libalpm/conflict.h:1.12 Mon Feb 19 21:14:27 2007 +++ pacman-lib/lib/libalpm/conflict.h Mon Mar 5 17:13:33 2007 @@ -21,8 +21,9 @@ #ifndef _ALPM_CONFLICT_H #define _ALPM_CONFLICT_H -#include "db.h" #include "alpm.h" +#include "db.h" +#include "package.h" #define CONFLICT_FILE_LEN 512 Index: pacman-lib/lib/libalpm/db.c diff -u pacman-lib/lib/libalpm/db.c:1.65 pacman-lib/lib/libalpm/db.c:1.66 --- pacman-lib/lib/libalpm/db.c:1.65 Sun Mar 4 04:08:54 2007 +++ pacman-lib/lib/libalpm/db.c Mon Mar 5 17:13:34 2007 @@ -23,30 +23,32 @@ * USA. */ -#if defined(__APPLE__) || defined(__OpenBSD__) -#include <sys/syslimits.h> -#include <sys/stat.h> -#endif - #include "config.h" + #include <unistd.h> #include <stdio.h> #include <stdlib.h> #include <errno.h> #include <string.h> #include <sys/stat.h> +#if defined(__APPLE__) || defined(__OpenBSD__) +#include <sys/syslimits.h> +#include <sys/stat.h> +#endif #include <dirent.h> #include <libintl.h> #include <regex.h> #ifdef CYGWIN #include <limits.h> /* PATH_MAX */ #endif -/* pacman */ + +/* libalpm */ +#include "db.h" +#include "alpm_list.h" #include "log.h" #include "util.h" #include "error.h" #include "server.h" -#include "db.h" #include "handle.h" #include "cache.h" #include "alpm.h" Index: pacman-lib/lib/libalpm/deps.c diff -u pacman-lib/lib/libalpm/deps.c:1.75 pacman-lib/lib/libalpm/deps.c:1.76 --- pacman-lib/lib/libalpm/deps.c:1.75 Sat Mar 3 04:43:16 2007 +++ pacman-lib/lib/libalpm/deps.c Mon Mar 5 17:13:34 2007 @@ -21,6 +21,8 @@ * USA. */ +#include "config.h" + #include <stdlib.h> #include <stdio.h> #include <string.h> @@ -29,16 +31,17 @@ #endif #include <libintl.h> #include <math.h> -/* pacman */ + +/* libalpm */ +#include "deps.h" +#include "alpm_list.h" #include "util.h" #include "log.h" #include "error.h" -#include "alpm_list.h" #include "package.h" #include "db.h" #include "cache.h" #include "provide.h" -#include "deps.h" #include "versioncmp.h" #include "handle.h" Index: pacman-lib/lib/libalpm/error.c diff -u pacman-lib/lib/libalpm/error.c:1.18 pacman-lib/lib/libalpm/error.c:1.19 --- pacman-lib/lib/libalpm/error.c:1.18 Fri Feb 9 05:10:49 2007 +++ pacman-lib/lib/libalpm/error.c Mon Mar 5 17:13:34 2007 @@ -22,10 +22,16 @@ * USA. */ +#include "config.h" + #include <libintl.h> + +/* libalpm */ +#include "error.h" #include "util.h" #include "alpm.h" +/* TODO does this really need a file all on its own? */ char SYMEXPORT *alpm_strerror(int err) { switch(err) { Index: pacman-lib/lib/libalpm/group.c diff -u pacman-lib/lib/libalpm/group.c:1.15 pacman-lib/lib/libalpm/group.c:1.16 --- pacman-lib/lib/libalpm/group.c:1.15 Mon Feb 26 03:38:48 2007 +++ pacman-lib/lib/libalpm/group.c Mon Mar 5 17:13:34 2007 @@ -20,16 +20,18 @@ */ #include "config.h" + #include <stdlib.h> #include <stdio.h> #include <string.h> #include <libintl.h> -/* pacman */ + +/* libalpm */ +#include "group.h" +#include "alpm_list.h" #include "util.h" #include "error.h" #include "log.h" -#include "group.h" -#include "alpm_list.h" #include "alpm.h" pmgrp_t *_alpm_grp_new() Index: pacman-lib/lib/libalpm/handle.c diff -u pacman-lib/lib/libalpm/handle.c:1.36 pacman-lib/lib/libalpm/handle.c:1.37 --- pacman-lib/lib/libalpm/handle.c:1.36 Sun Mar 4 04:16:28 2007 +++ pacman-lib/lib/libalpm/handle.c Mon Mar 5 17:13:34 2007 @@ -22,6 +22,7 @@ */ #include "config.h" + #include <stdlib.h> #include <string.h> #include <unistd.h> @@ -30,15 +31,16 @@ #include <syslog.h> #include <libintl.h> #include <time.h> -/* pacman */ + +/* libalpm */ +#include "handle.h" +#include "alpm_list.h" #include "util.h" #include "log.h" -#include "alpm_list.h" #include "error.h" #include "trans.h" #include "alpm.h" #include "server.h" -#include "handle.h" pmhandle_t *_alpm_handle_new() { Index: pacman-lib/lib/libalpm/handle.h diff -u pacman-lib/lib/libalpm/handle.h:1.16 pacman-lib/lib/libalpm/handle.h:1.17 --- pacman-lib/lib/libalpm/handle.h:1.16 Wed Feb 21 01:44:15 2007 +++ pacman-lib/lib/libalpm/handle.h Mon Mar 5 17:13:34 2007 @@ -21,9 +21,11 @@ #ifndef _ALPM_HANDLE_H #define _ALPM_HANDLE_H +#include <stdio.h> + +#include "alpm_list.h" #include "db.h" #include "log.h" -#include "alpm_list.h" #include "alpm.h" #include "trans.h" Index: pacman-lib/lib/libalpm/log.c diff -u pacman-lib/lib/libalpm/log.c:1.9 pacman-lib/lib/libalpm/log.c:1.10 --- pacman-lib/lib/libalpm/log.c:1.9 Tue Jan 23 22:02:54 2007 +++ pacman-lib/lib/libalpm/log.c Mon Mar 5 17:13:34 2007 @@ -20,12 +20,14 @@ */ #include "config.h" + #include <stdio.h> #include <stdarg.h> #include <time.h> -/* pacman */ -#include "alpm.h" + +/* libalpm */ #include "log.h" +#include "alpm.h" void _alpm_log(pmloglevel_t flag, char *fmt, ...) { Index: pacman-lib/lib/libalpm/md5.c diff -u pacman-lib/lib/libalpm/md5.c:1.3 pacman-lib/lib/libalpm/md5.c:1.4 --- pacman-lib/lib/libalpm/md5.c:1.3 Sun Oct 15 15:31:05 2006 +++ pacman-lib/lib/libalpm/md5.c Mon Mar 5 17:13:34 2007 @@ -24,6 +24,7 @@ */ #include <string.h> + #include "md5.h" /* Constants for MD5Transform routine. Index: pacman-lib/lib/libalpm/md5driver.c diff -u pacman-lib/lib/libalpm/md5driver.c:1.6 pacman-lib/lib/libalpm/md5driver.c:1.7 --- pacman-lib/lib/libalpm/md5driver.c:1.6 Sun Mar 4 04:08:55 2007 +++ pacman-lib/lib/libalpm/md5driver.c Mon Mar 5 17:13:34 2007 @@ -19,10 +19,14 @@ */ #define MD MD5 +#include "config.h" + #include <stdlib.h> #include <stdio.h> #include <string.h> #include <libintl.h> + +/* libalpm */ #include "alpm.h" #include "log.h" #include "util.h" Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.83 pacman-lib/lib/libalpm/package.c:1.84 --- pacman-lib/lib/libalpm/package.c:1.83 Sat Mar 3 04:43:16 2007 +++ pacman-lib/lib/libalpm/package.c Mon Mar 5 17:13:34 2007 @@ -23,6 +23,7 @@ */ #include "config.h" + #include <stdio.h> #include <stdlib.h> #include <limits.h> @@ -33,12 +34,13 @@ #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> -/* pacman */ + +/* libalpm */ #include "package.h" +#include "alpm_list.h" #include "log.h" #include "util.h" #include "error.h" -#include "alpm_list.h" #include "db.h" #include "cache.h" #include "provide.h" Index: pacman-lib/lib/libalpm/provide.c diff -u pacman-lib/lib/libalpm/provide.c:1.13 pacman-lib/lib/libalpm/provide.c:1.14 --- pacman-lib/lib/libalpm/provide.c:1.13 Sat Mar 3 03:14:00 2007 +++ pacman-lib/lib/libalpm/provide.c Mon Mar 5 17:13:34 2007 @@ -20,14 +20,16 @@ */ #include "config.h" + #include <stdlib.h> #include <string.h> -/* pacman */ -#include "cache.h" + +/* libalpm */ +#include "provide.h" #include "alpm_list.h" +#include "cache.h" #include "db.h" #include "log.h" -#include "provide.h" /* return a alpm_list_t of packages in "db" that provide "package" */ Index: pacman-lib/lib/libalpm/remove.c diff -u pacman-lib/lib/libalpm/remove.c:1.73 pacman-lib/lib/libalpm/remove.c:1.74 --- pacman-lib/lib/libalpm/remove.c:1.73 Sat Mar 3 20:22:57 2007 +++ pacman-lib/lib/libalpm/remove.c Mon Mar 5 17:13:34 2007 @@ -23,24 +23,26 @@ * USA. */ -#if defined(__APPLE__) || defined(__OpenBSD__) -#include <sys/syslimits.h> -#endif -#if defined(__APPLE__) || defined(__OpenBSD__) || defined(__sun__) -#include <sys/stat.h> -#endif - #include "config.h" + #include <stdlib.h> #include <errno.h> #include <time.h> #include <fcntl.h> #include <string.h> #include <limits.h> +#if defined(__APPLE__) || defined(__OpenBSD__) +#include <sys/syslimits.h> +#endif +#if defined(__APPLE__) || defined(__OpenBSD__) || defined(__sun__) +#include <sys/stat.h> +#endif #include <unistd.h> #include <errno.h> #include <libintl.h> -/* pacman */ + +/* libalpm */ +#include "remove.h" #include "alpm_list.h" #include "trans.h" #include "util.h" @@ -55,7 +57,6 @@ #include "cache.h" #include "deps.h" #include "provide.h" -#include "remove.h" #include "handle.h" #include "alpm.h" Index: pacman-lib/lib/libalpm/server.c diff -u pacman-lib/lib/libalpm/server.c:1.22 pacman-lib/lib/libalpm/server.c:1.23 --- pacman-lib/lib/libalpm/server.c:1.22 Mon Feb 12 01:31:39 2007 +++ pacman-lib/lib/libalpm/server.c Mon Mar 5 17:13:34 2007 @@ -19,6 +19,8 @@ * USA. */ +#include "config.h" + #include <stdlib.h> #include <string.h> #include <stdio.h> @@ -29,8 +31,9 @@ #include <time.h> #include <download.h> -/* pacman */ +/* libalpm */ #include "server.h" +#include "alpm_list.h" #include "error.h" #include "log.h" #include "alpm.h" Index: pacman-lib/lib/libalpm/sha1.c diff -u pacman-lib/lib/libalpm/sha1.c:1.5 pacman-lib/lib/libalpm/sha1.c:1.6 --- pacman-lib/lib/libalpm/sha1.c:1.5 Sun Mar 4 04:08:55 2007 +++ pacman-lib/lib/libalpm/sha1.c Mon Mar 5 17:13:34 2007 @@ -22,20 +22,18 @@ Robert Klep <robert(a)ilse.nl> -- Expansion function fix */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include "config.h" + +#include <sys/types.h> +#include <stdlib.h> +#include <string.h> #include <libintl.h> +/* libalpm */ +#include "sha1.h" #include "alpm.h" #include "log.h" #include "util.h" -#include "sha1.h" - -#include <sys/types.h> - -#include <stdlib.h> -#include <string.h> /* Not-swap is a macro that does an endian swap on architectures that are Index: pacman-lib/lib/libalpm/sync.c diff -u pacman-lib/lib/libalpm/sync.c:1.109 pacman-lib/lib/libalpm/sync.c:1.110 --- pacman-lib/lib/libalpm/sync.c:1.109 Sun Mar 4 04:08:55 2007 +++ pacman-lib/lib/libalpm/sync.c Mon Mar 5 17:13:34 2007 @@ -23,6 +23,7 @@ */ #include "config.h" + #include <stdlib.h> #include <stdio.h> #include <fcntl.h> @@ -33,10 +34,12 @@ #endif #include <dirent.h> #include <libintl.h> -/* pacman */ + +/* libalpm */ +#include "sync.h" +#include "alpm_list.h" #include "log.h" #include "error.h" -#include "alpm_list.h" #include "package.h" #include "db.h" #include "cache.h" @@ -45,7 +48,6 @@ #include "provide.h" #include "trans.h" #include "util.h" -#include "sync.h" #include "versioncmp.h" #include "handle.h" #include "util.h" Index: pacman-lib/lib/libalpm/trans.c diff -u pacman-lib/lib/libalpm/trans.c:1.41 pacman-lib/lib/libalpm/trans.c:1.42 --- pacman-lib/lib/libalpm/trans.c:1.41 Sat Mar 3 04:43:16 2007 +++ pacman-lib/lib/libalpm/trans.c Mon Mar 5 17:13:34 2007 @@ -23,16 +23,19 @@ */ #include "config.h" + #include <stdlib.h> #include <stdio.h> #include <string.h> #include <libintl.h> -/* pacman */ + +/* libalpm */ +#include "trans.h" +#include "alpm_list.h" #include "error.h" #include "package.h" #include "util.h" #include "log.h" -#include "alpm_list.h" #include "handle.h" #include "add.h" #include "remove.h" Index: pacman-lib/lib/libalpm/util.c diff -u pacman-lib/lib/libalpm/util.c:1.48 pacman-lib/lib/libalpm/util.c:1.49 --- pacman-lib/lib/libalpm/util.c:1.48 Sun Mar 4 04:08:55 2007 +++ pacman-lib/lib/libalpm/util.c Mon Mar 5 17:13:34 2007 @@ -23,14 +23,8 @@ * USA. */ -#if defined(__APPLE__) || defined(__OpenBSD__) -#include <sys/syslimits.h> -#endif -#if defined(__APPLE__) || defined(__OpenBSD__) || defined(__sun__) -#include <sys/stat.h> -#endif - #include "config.h" + #include <stdio.h> #include <stdlib.h> #ifdef __sun__ @@ -45,6 +39,12 @@ #include <time.h> #include <syslog.h> #include <sys/wait.h> +#if defined(__APPLE__) || defined(__OpenBSD__) +#include <sys/syslimits.h> +#endif +#if defined(__APPLE__) || defined(__OpenBSD__) || defined(__sun__) +#include <sys/stat.h> +#endif #include <libintl.h> #ifdef CYGWIN #include <limits.h> /* PATH_MAX */ @@ -54,12 +54,12 @@ #include <mntent.h> #endif -/* pacman */ +/* libalpm */ +#include "util.h" #include "alpm_list.h" #include "log.h" #include "trans.h" #include "sync.h" -#include "util.h" #include "error.h" #include "package.h" #include "alpm.h" Index: pacman-lib/lib/libalpm/versioncmp.c diff -u pacman-lib/lib/libalpm/versioncmp.c:1.16 pacman-lib/lib/libalpm/versioncmp.c:1.17 --- pacman-lib/lib/libalpm/versioncmp.c:1.16 Sat Mar 3 03:14:00 2007 +++ pacman-lib/lib/libalpm/versioncmp.c Mon Mar 5 17:13:34 2007 @@ -22,17 +22,19 @@ */ #include "config.h" + #include <stdlib.h> #include <stdio.h> #include <ctype.h> #include <string.h> #include <libintl.h> -/* pacman */ + +/* libalpm */ +#include "versioncmp.h" +#include "alpm_list.h" #include "alpm.h" #include "log.h" #include "util.h" -#include "alpm_list.h" -#include "versioncmp.h" #ifndef HAVE_STRVERSCMP /* GNU's strverscmp() function, taken from glibc 2.3.2 sources Index: pacman-lib/pactest/util.py diff -u pacman-lib/pactest/util.py:1.5 pacman-lib/pactest/util.py:1.6 --- pacman-lib/pactest/util.py:1.5 Mon Mar 5 13:06:12 2007 +++ pacman-lib/pactest/util.py Mon Mar 5 17:13:34 2007 @@ -255,7 +255,7 @@ else: parent, thisdir = os.path.split(dir) if parent: mkdir(parent) #recurse to make all parents - print "making dir %s" % thisdir + vprint("making dir %s" % thisdir) if thisdir: os.mkdir(dir) if __name__ == "__main__": Index: pacman-lib/src/pacman/add.c diff -u pacman-lib/src/pacman/add.c:1.33 pacman-lib/src/pacman/add.c:1.34 --- pacman-lib/src/pacman/add.c:1.33 Wed Feb 28 23:51:33 2007 +++ pacman-lib/src/pacman/add.c Mon Mar 5 17:13:35 2007 @@ -19,6 +19,8 @@ * USA. */ +#include "config.h" + #include <stdlib.h> #include <stdio.h> #include <string.h> @@ -26,11 +28,12 @@ #include <alpm.h> #include <alpm_list.h> + /* pacman */ +#include "add.h" #include "log.h" #include "downloadprog.h" #include "trans.h" -#include "add.h" #include "conf.h" #include "util.h" Index: pacman-lib/src/pacman/conf.c diff -u pacman-lib/src/pacman/conf.c:1.22 pacman-lib/src/pacman/conf.c:1.23 --- pacman-lib/src/pacman/conf.c:1.22 Wed Jan 31 01:10:22 2007 +++ pacman-lib/src/pacman/conf.c Mon Mar 5 17:13:35 2007 @@ -19,6 +19,8 @@ * USA. */ +#include "config.h" + #include <stdlib.h> #include <stdio.h> #include <string.h> @@ -26,12 +28,13 @@ #include <libintl.h> #include <alpm.h> + /* pacman */ +#include "conf.h" #include "util.h" #include "log.h" #include "sync.h" #include "downloadprog.h" -#include "conf.h" config_t *config_new() { Index: pacman-lib/src/pacman/deptest.c diff -u pacman-lib/src/pacman/deptest.c:1.15 pacman-lib/src/pacman/deptest.c:1.16 --- pacman-lib/src/pacman/deptest.c:1.15 Mon Feb 26 03:43:02 2007 +++ pacman-lib/src/pacman/deptest.c Mon Mar 5 17:13:35 2007 @@ -25,14 +25,16 @@ #include <stdio.h> #include <string.h> #include <libintl.h> + #include <alpm.h> #include <alpm_list.h> + /* pacman */ +#include "deptest.h" #include "util.h" #include "conf.h" #include "log.h" #include "sync.h" -#include "deptest.h" extern config_t *config; Index: pacman-lib/src/pacman/downloadprog.c diff -u pacman-lib/src/pacman/downloadprog.c:1.15 pacman-lib/src/pacman/downloadprog.c:1.16 --- pacman-lib/src/pacman/downloadprog.c:1.15 Sat Feb 17 03:55:06 2007 +++ pacman-lib/src/pacman/downloadprog.c Mon Mar 5 17:13:35 2007 @@ -20,6 +20,7 @@ */ #include "config.h" + #include <limits.h> #include <stdio.h> #include <stdlib.h> @@ -32,10 +33,11 @@ #include <math.h> #include <alpm.h> + /* pacman */ +#include "downloadprog.h" #include "util.h" #include "log.h" -#include "downloadprog.h" #include "conf.h" /* progress bar */ Index: pacman-lib/src/pacman/log.c diff -u pacman-lib/src/pacman/log.c:1.31 pacman-lib/src/pacman/log.c:1.32 --- pacman-lib/src/pacman/log.c:1.31 Sat Feb 17 03:55:06 2007 +++ pacman-lib/src/pacman/log.c Mon Mar 5 17:13:35 2007 @@ -20,6 +20,7 @@ */ #include "config.h" + #include <stdio.h> #include <string.h> #include <stdarg.h> @@ -28,6 +29,7 @@ #include <libintl.h> #include <alpm.h> + /* pacman */ #include "log.h" #include "conf.h" Index: pacman-lib/src/pacman/package.c diff -u pacman-lib/src/pacman/package.c:1.32 pacman-lib/src/pacman/package.c:1.33 --- pacman-lib/src/pacman/package.c:1.32 Wed Feb 28 23:51:24 2007 +++ pacman-lib/src/pacman/package.c Mon Mar 5 17:13:35 2007 @@ -19,6 +19,8 @@ * USA. */ +#include "config.h" + #include <stdlib.h> #include <stdio.h> #include <string.h> @@ -28,10 +30,11 @@ #include <alpm.h> #include <alpm_list.h> + /* pacman */ +#include "package.h" #include "log.h" #include "util.h" -#include "package.h" /* Display the content of an installed package * Index: pacman-lib/src/pacman/pacman.c diff -u pacman-lib/src/pacman/pacman.c:1.103 pacman-lib/src/pacman/pacman.c:1.104 --- pacman-lib/src/pacman/pacman.c:1.103 Sun Mar 4 04:16:28 2007 +++ pacman-lib/src/pacman/pacman.c Mon Mar 5 17:13:35 2007 @@ -20,6 +20,7 @@ */ #include "config.h" + #include <stdlib.h> #include <stdio.h> #include <limits.h> @@ -44,6 +45,7 @@ #include <alpm.h> #include <alpm_list.h> + /* pacman */ #include "util.h" #include "log.h" Index: pacman-lib/src/pacman/query.c diff -u pacman-lib/src/pacman/query.c:1.26 pacman-lib/src/pacman/query.c:1.27 --- pacman-lib/src/pacman/query.c:1.26 Mon Feb 26 03:43:02 2007 +++ pacman-lib/src/pacman/query.c Mon Mar 5 17:13:35 2007 @@ -19,6 +19,8 @@ * USA. */ +#include "config.h" + #include <stdlib.h> #include <stdio.h> #include <limits.h> @@ -28,9 +30,10 @@ #include <alpm.h> #include <alpm_list.h> + /* pacman */ -#include "package.h" #include "query.h" +#include "package.h" #include "log.h" #include "conf.h" #include "sync.h" Index: pacman-lib/src/pacman/remove.c diff -u pacman-lib/src/pacman/remove.c:1.29 pacman-lib/src/pacman/remove.c:1.30 --- pacman-lib/src/pacman/remove.c:1.29 Mon Feb 26 03:43:02 2007 +++ pacman-lib/src/pacman/remove.c Mon Mar 5 17:13:35 2007 @@ -19,6 +19,8 @@ * USA. */ +#include "config.h" + #include <stdlib.h> #include <stdio.h> #include <string.h> @@ -26,11 +28,12 @@ #include <alpm.h> #include <alpm_list.h> + /* pacman */ +#include "remove.h" #include "util.h" #include "log.h" #include "trans.h" -#include "remove.h" #include "conf.h" extern config_t *config; Index: pacman-lib/src/pacman/sync.c diff -u pacman-lib/src/pacman/sync.c:1.115 pacman-lib/src/pacman/sync.c:1.116 --- pacman-lib/src/pacman/sync.c:1.115 Mon Feb 26 03:43:02 2007 +++ pacman-lib/src/pacman/sync.c Mon Mar 5 17:13:35 2007 @@ -19,16 +19,15 @@ * USA. */ -#if defined(__APPLE__) || defined(__OpenBSD__) -#include <sys/syslimits.h> -#include <sys/stat.h> -#endif - #include "config.h" + #include <stdio.h> #include <stdlib.h> #include <string.h> #include <sys/stat.h> +#if defined(__APPLE__) || defined(__OpenBSD__) +#include <sys/syslimits.h> +#endif #include <unistd.h> #include <dirent.h> #include <libintl.h> @@ -41,13 +40,14 @@ #include <download.h> /* downloadLastErrString */ /* TODO remove above download.h inclusion once we abstract more, and also * remove it from Makefile.am on the pacman side */ + /* pacman */ +#include "sync.h" #include "util.h" #include "log.h" #include "downloadprog.h" #include "package.h" #include "trans.h" -#include "sync.h" #include "conf.h" extern config_t *config; Index: pacman-lib/src/pacman/trans.c diff -u pacman-lib/src/pacman/trans.c:1.41 pacman-lib/src/pacman/trans.c:1.42 --- pacman-lib/src/pacman/trans.c:1.41 Sat Mar 3 04:43:16 2007 +++ pacman-lib/src/pacman/trans.c Mon Mar 5 17:13:35 2007 @@ -20,6 +20,7 @@ */ #include "config.h" + #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -30,10 +31,11 @@ #include <wchar.h> #include <alpm.h> + /* pacman */ +#include "trans.h" #include "util.h" #include "log.h" -#include "trans.h" #include "conf.h" #define LOG_STR_LEN 256 Index: pacman-lib/src/pacman/upgrade.c diff -u pacman-lib/src/pacman/upgrade.c:1.6 pacman-lib/src/pacman/upgrade.c:1.7 --- pacman-lib/src/pacman/upgrade.c:1.6 Fri Jan 19 04:28:46 2007 +++ pacman-lib/src/pacman/upgrade.c Mon Mar 5 17:13:35 2007 @@ -19,15 +19,16 @@ * USA. */ +#include "config.h" + #include <stdlib.h> -#include <stdio.h> -#include <string.h> #include <alpm.h> #include <alpm_list.h> + /* pacman */ -#include "add.h" #include "upgrade.h" +#include "add.h" #include "conf.h" extern config_t *config; Index: pacman-lib/src/pacman/util.c diff -u pacman-lib/src/pacman/util.c:1.30 pacman-lib/src/pacman/util.c:1.31 --- pacman-lib/src/pacman/util.c:1.30 Mon Feb 26 03:43:02 2007 +++ pacman-lib/src/pacman/util.c Mon Mar 5 17:13:35 2007 @@ -19,16 +19,16 @@ * USA. */ +#include "config.h" + #if defined(__APPLE__) || defined(__OpenBSD__) #include <sys/syslimits.h> #include <sys/stat.h> #endif - #include <sys/types.h> #include <sys/ioctl.h> #include <sys/time.h> -#include "config.h" #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -44,6 +44,7 @@ #include <alpm.h> #include <alpm_list.h> + /* pacman */ #include "util.h" #include "conf.h" Index: pacman-lib/src/util/testpkg.c diff -u pacman-lib/src/util/testpkg.c:1.1 pacman-lib/src/util/testpkg.c:1.2 --- pacman-lib/src/util/testpkg.c:1.1 Sun Feb 11 20:30:03 2007 +++ pacman-lib/src/util/testpkg.c Mon Mar 5 17:13:35 2007 @@ -19,6 +19,8 @@ * USA. */ +#include "config.h" + #include <stdio.h> #include <stdlib.h> #include <string.h> Index: pacman-lib/src/util/vercmp.c diff -u pacman-lib/src/util/vercmp.c:1.7 pacman-lib/src/util/vercmp.c:1.8 --- pacman-lib/src/util/vercmp.c:1.7 Fri Feb 9 16:08:12 2007 +++ pacman-lib/src/util/vercmp.c Mon Mar 5 17:13:35 2007 @@ -19,14 +19,18 @@ * USA. */ +#include "config.h" + #include <stdio.h> #include <string.h> #include <errno.h> #include <unistd.h> #include <limits.h> +/* TODO this is probably not the best way to do this */ #ifndef PATH_MAX #define PATH_MAX 1024 #endif + #include <alpm.h> int main(int argc, char *argv[])

1 0

[pacman-dev] libalpm does not use localized strings
by Pierre Schmitz 05 Mar '07

05 Mar '07

Hi, I just noticed that pacman3 does not use the translated string (libalpm;error.c:96) I got this output: [root@athlon64 pierre]# pacman -Rcs clamav Fehler: Konnte Paket 'clamav' nicht hinzufügen (could not find or read package) Does anybody know why this happens? I checked the de.po file and error.c; both seem to be ok. -- http://www.archlinux.deHi,

3 6

[pacman-dev] CVS update of pacman-lib/lib/libalpm (alpm.c)
by Dan McGee 05 Mar '07

05 Mar '07

Date: Monday, March 5, 2007 @ 14:21:33 Author: dan Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: alpm.c (1.123 -> 1.124) * Failure to #include config.h cost us here, we lost all NLS in alpm.c. --------+ alpm.c | 1 + 1 file changed, 1 insertion(+) Index: pacman-lib/lib/libalpm/alpm.c diff -u pacman-lib/lib/libalpm/alpm.c:1.123 pacman-lib/lib/libalpm/alpm.c:1.124 --- pacman-lib/lib/libalpm/alpm.c:1.123 Sun Mar 4 04:08:54 2007 +++ pacman-lib/lib/libalpm/alpm.c Mon Mar 5 14:21:33 2007 @@ -37,6 +37,7 @@ #include <stdarg.h> #include <libintl.h> /* pacman */ +#include "config.h" #include "log.h" #include "error.h" #include "versioncmp.h"

1 0

[pacman-dev] CVS update of pacman-lib/pactest (6 files)
by Aaron Griffin 05 Mar '07

05 Mar '07

Date: Monday, March 5, 2007 @ 13:06:12 Author: aaron Path: /home/cvs-pacman/pacman-lib/pactest Modified: pactest.py (1.8 -> 1.9) pmdb.py (1.5 -> 1.6) pmpkg.py (1.4 -> 1.5) pmrule.py (1.5 -> 1.6) pmtest.py (1.5 -> 1.6) util.py (1.4 -> 1.5) * Fixed an issue with globbing the --test argument * Added a custom 'mkdir' function which makes parents and doesn't fail on existence * Added output for 'SKIP' messages (it did not indicate WHY it was skipped) * Added the ability to generate DB packages in the sync dir (not the cache dir) for testing downloading. (self.cachepkgs = False) * Added pmtest.path for the full path to the package file ------------+ pactest.py | 3 ++- pmdb.py | 5 ++--- pmpkg.py | 8 ++++++-- pmrule.py | 4 ++++ pmtest.py | 19 ++++++++++--------- util.py | 10 ++++++++++ 6 files changed, 34 insertions(+), 15 deletions(-) Index: pacman-lib/pactest/pactest.py diff -u pacman-lib/pactest/pactest.py:1.8 pacman-lib/pactest/pactest.py:1.9 --- pacman-lib/pactest/pactest.py:1.8 Fri Feb 23 00:12:58 2007 +++ pacman-lib/pactest/pactest.py Mon Mar 5 13:06:12 2007 @@ -36,7 +36,8 @@ globlist = [] # maintain the idx so we can modify rargs - while not parser.rargs[idx].startswith('-'): + while idx < len(parser.rargs) and \ + not parser.rargs[idx].startswith('-'): globlist += glob.glob(parser.rargs[idx]) idx += 1 Index: pacman-lib/pactest/pmdb.py diff -u pacman-lib/pactest/pmdb.py:1.5 pacman-lib/pactest/pmdb.py:1.6 --- pacman-lib/pactest/pmdb.py:1.5 Wed Feb 28 11:37:24 2007 +++ pacman-lib/pactest/pmdb.py Mon Mar 5 13:06:12 2007 @@ -219,8 +219,7 @@ """ path = os.path.join(self.dbdir, self.treename, pkg.fullname()) - if not os.path.isdir(path): - os.makedirs(path); + mkdir(path) # desc # for local db entries: name, version, desc, groups, url, license, @@ -332,7 +331,7 @@ mkdescfile(pkg.fullname(), pkg) # Generate database archive - os.makedirs(path, 0755) + mkdir(path) archive = os.path.join(path, "%s%s" % (self.treename, PM_EXT_DB)) os.system("tar zcf %s *" % archive) Index: pacman-lib/pactest/pmpkg.py diff -u pacman-lib/pactest/pmpkg.py:1.4 pacman-lib/pactest/pmpkg.py:1.5 --- pacman-lib/pactest/pmpkg.py:1.4 Tue Feb 27 11:25:01 2007 +++ pacman-lib/pactest/pmpkg.py Mon Mar 5 13:06:12 2007 @@ -33,6 +33,7 @@ """ def __init__(self, name, version = "1.0-1"): + self.path = "" #the path of the generated package # desc self.name = name self.version = version @@ -116,7 +117,7 @@ A package archive is generated in the location 'path', based on the data from the object. """ - archive = os.path.join(path, self.filename()) + self.path = os.path.join(path, self.filename()) curdir = os.getcwd() tmpdir = tempfile.mkdtemp() @@ -172,8 +173,11 @@ os.system("touch .FILELIST") targets += " .FILELIST" + #safely create the dir + mkdir(os.path.dirname(self.path)) + # Generate package archive - os.system("tar zcf %s %s" % (archive, targets)) + os.system("tar zcf %s %s" % (self.path, targets)) os.chdir(curdir) shutil.rmtree(tmpdir) Index: pacman-lib/pactest/pmrule.py diff -u pacman-lib/pactest/pmrule.py:1.5 pacman-lib/pactest/pmrule.py:1.6 --- pacman-lib/pactest/pmrule.py:1.5 Wed Feb 28 11:37:24 2007 +++ pacman-lib/pactest/pmrule.py Mon Mar 5 13:06:12 2007 @@ -57,6 +57,7 @@ if not grep(os.path.join(root, LOGFILE), key): success = 0 else: + print "PACMAN rule '%s' not found" % case success = -1 elif kind == "PKG": newpkg = localdb.db_read(key) @@ -100,6 +101,7 @@ if not found: success = 0 else: + print "PKG rule '%s' not found" % case success = -1 elif kind == "FILE": filename = os.path.join(root, key) @@ -122,8 +124,10 @@ if not os.path.isfile("%s%s" % (filename, PM_PACSAVE)): success = 0 else: + print "FILE rule '%s' not found" % case success = -1 else: + print "Rule kind '%s' not found" % kind success = -1 if self.false and success != -1: Index: pacman-lib/pactest/pmtest.py diff -u pacman-lib/pactest/pmtest.py:1.5 pacman-lib/pactest/pmtest.py:1.6 --- pacman-lib/pactest/pmtest.py:1.5 Mon Feb 26 03:19:03 2007 +++ pacman-lib/pactest/pmtest.py Mon Mar 5 13:06:12 2007 @@ -38,6 +38,7 @@ self.name = name self.testname = os.path.basename(name).replace('.py', '') self.root = root + self.cachepkgs = True def __str__(self): return "name = %s\n" \ @@ -130,14 +131,15 @@ vprint("\t%s" % os.path.join(TMPDIR, pkg.filename())) pkg.makepkg(tmpdir) for key, value in self.db.iteritems(): - if key == "local": - continue + if key == "local": continue for pkg in value.pkgs: - archive = pkg.filename() - vprint("\t%s" % os.path.join(PM_CACHEDIR, archive)) - pkg.makepkg(cachedir) - pkg.md5sum = getmd5sum(os.path.join(cachedir, archive)) - pkg.csize = os.stat(os.path.join(cachedir, archive))[stat.ST_SIZE] + vprint("\t%s" % os.path.join(PM_CACHEDIR, pkg.filename())) + if self.cachepkgs: + pkg.makepkg(cachedir) + else: + pkg.makepkg(os.path.join(syncdir, value.treename)) + pkg.md5sum = getmd5sum(pkg.path) + pkg.csize = os.stat(pkg.path)[stat.ST_SIZE] # Populating databases vprint(" Populating databases") @@ -151,8 +153,7 @@ # Creating sync database archives vprint(" Creating sync database archives") for key, value in self.db.iteritems(): - if key == "local": - continue + if key == "local": continue archive = value.treename + PM_EXT_DB vprint("\t" + os.path.join(SYNCREPO, archive)) value.gensync(os.path.join(syncdir, value.treename)) Index: pacman-lib/pactest/util.py diff -u pacman-lib/pactest/util.py:1.4 pacman-lib/pactest/util.py:1.5 --- pacman-lib/pactest/util.py:1.4 Wed Feb 28 11:37:24 2007 +++ pacman-lib/pactest/util.py Mon Mar 5 13:06:12 2007 @@ -247,6 +247,16 @@ fd.close() return found +def mkdir(dir): + if os.path.isdir(dir): + return + elif os.path.isfile(dir): + raise OSError("'%s' already exists and is not a directory" % dir) + else: + parent, thisdir = os.path.split(dir) + if parent: mkdir(parent) #recurse to make all parents + print "making dir %s" % thisdir + if thisdir: os.mkdir(dir) if __name__ == "__main__": pass

3 3

[pacman-dev] CVS update of pacman-lib/pactest/tests (xfercommand001.py)
by Aaron Griffin 05 Mar '07

05 Mar '07

Date: Monday, March 5, 2007 @ 13:06:45 Author: aaron Path: /home/cvs-pacman/pacman-lib/pactest/tests Added: xfercommand001.py (1.1) Added this test to check the XferCommand functionality -------------------+ xfercommand001.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) Index: pacman-lib/pactest/tests/xfercommand001.py diff -u /dev/null pacman-lib/pactest/tests/xfercommand001.py:1.1 --- /dev/null Mon Mar 5 13:06:45 2007 +++ pacman-lib/pactest/tests/xfercommand001.py Mon Mar 5 13:06:45 2007 @@ -0,0 +1,20 @@ +self.description = "Quick check for using XferCommand" + +# this setting forces us to download packages +self.cachepkgs = False +#wget doesn't support file:// urls. curl does +self.option['xfercommand'] = ['/usr/bin/curl %u > %o'] + +numpkgs = 10 +pkgnames = [] +for i in xrange(numpkgs): + name = "pkg_%s" % i + pkgnames.append(name) + p = pmpkg(name) + p.files = ["usr/bin/foo-%s" % i] + self.addpkg2db("sync", p) + +self.args = "-S %s" % ' '.join(pkgnames) + +for name in pkgnames: + self.addrule("PKG_EXIST=%s" % name)

1 0

[pacman-dev] vercmp / force update
by Andreas Radke 05 Mar '07

05 Mar '07

we use "vercmp" to create our diffscript http://archlinux.org/~andyrtr/pkg_diff.html vercmp still reports 0.8.10a < 0.8.10 that's why we have to use force='y' in our PKGBUILDS that also appears in pkgdesc shouldn't we fix this before the release? i suggest to create a strict rule how to mark "alpha", "beta" and "rc" packages to get them detected as smaller values than the next/final and any other post-final "a" or "A" release. Andy

4 3

[pacman-dev] No .install messages standard yet?
by Alessio 'mOLOk' Bolognino 05 Mar '07

05 Mar '07

I think you should define a standard for the .install message to avoid the actual anarchy and proliferation of very different styles. Just my 2c, -- Alessio 'mOLOk' Bolognino Arch Linux Trusted User http://www.archlinux.org

5 4