- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.1.4-110-gba70c52
by Dan McGee 15 Apr '08

15 Apr '08

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 ba70c52945c9e568100ca3a4eeb3ea1208d378ad (commit) from 2d991a25ae23ca73a9fd01aacade9e2842c2f9db (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 ba70c52945c9e568100ca3a4eeb3ea1208d378ad Author: Dan McGee <dan(a)archlinux.org> Date: Mon Apr 14 18:24:45 2008 -0500 Fix compilation errors on x86_64 Things must have gotten stricter with GCC 4.3 on the '%zd' printf string and this is the first I've tried to compile there. Fix the problem by using size_t instead of int. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.1.4-109-g2d991a2
by Dan McGee 15 Apr '08

15 Apr '08

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 2d991a25ae23ca73a9fd01aacade9e2842c2f9db (commit) via db4258c1fdf27708968baf9c4e730a014af40fd8 (commit) via 9f561370348ce44b2a5453ba63a8bf405c69e6f3 (commit) from ee2bbb39b52e9a62bc295792339ff46e245fad19 (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 2d991a25ae23ca73a9fd01aacade9e2842c2f9db Author: K. Piche <kevin(a)archlinux.org> Date: Fri Apr 4 23:02:23 2008 -0400 remove.c: refactor into functions Pulled two loops out of _alpm_remove_prepare and gave them their own functions. Signed-off-by: K. Piche <kevin(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit db4258c1fdf27708968baf9c4e730a014af40fd8 Author: K. Piche <kevin(a)archlinux.org> Date: Tue Apr 8 23:30:46 2008 -0400 Some comments for _alpm_unpack. Signed-off-by: K. Piche <kevin(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9f561370348ce44b2a5453ba63a8bf405c69e6f3 Author: K. Piche <kevin(a)archlinux.org> Date: Tue Apr 8 23:14:21 2008 -0400 add.c: added some tracing and improved some variable locality Signed-off-by: K. Piche <kevin(a)archlinux.org> [Dan: removed one logger] Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 13 +++++-- lib/libalpm/remove.c | 99 ++++++++++++++++++++++++++++++-------------------- lib/libalpm/util.c | 11 ++++++ 3 files changed, 80 insertions(+), 43 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Add some tracing and move some variables in add.c
by K. Piche 15 Apr '08

15 Apr '08

>From 8f27d437dd27617969403a7113c178e8ccfa89c2 Mon Sep 17 00:00:00 2001 From: K. Piche <kevin(a)archlinux.org> Date: Tue, 8 Apr 2008 23:14:21 -0400 Subject: [PATCH] Added some tracing and improved some variable locality. Signed-off-by: K. Piche <kevin(a)archlinux.org> --- lib/libalpm/add.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 05935a7..a4ed175 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -195,6 +195,9 @@ static int upgrade_remove(pmpkg_t *oldpkg, pmpkg_t *newpkg, pmtrans_t *trans, pm * with the type PM_TRANS_TYPE_REMOVEUPGRADE. TODO: kill this weird * behavior. */ pmtrans_t *tr = _alpm_trans_new(); + + ALPM_LOG_FUNC; + _alpm_log(PM_LOG_DEBUG, "removing old package first (%s-%s)\n", oldpkg->name, oldpkg->version); @@ -285,6 +288,8 @@ static int extract_single_file(struct archive *archive, ARCHIVE_EXTRACT_TIME; int errors = 0; + ALPM_LOG_FUNC; + strncpy(entryname, archive_entry_pathname(entry), PATH_MAX); entrymode = archive_entry_mode(entry); @@ -631,14 +636,13 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count, pmtrans_t *trans, pmdb_t *db) { int i, ret = 0, errors = 0; - struct archive *archive; - struct archive_entry *entry; - char cwd[PATH_MAX] = ""; char scriptlet[PATH_MAX+1]; int is_upgrade = 0; double percent = 0.0; pmpkg_t *oldpkg = NULL; + ALPM_LOG_FUNC; + snprintf(scriptlet, PATH_MAX, "%s%s-%s/install", db->path, alpm_pkg_get_name(newpkg), alpm_pkg_get_version(newpkg)); @@ -693,6 +697,10 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count, if(!(trans->flags & PM_TRANS_FLAG_DBONLY)) { _alpm_log(PM_LOG_DEBUG, "extracting files\n"); + struct archive *archive; + struct archive_entry *entry; + char cwd[PATH_MAX] = ""; + if ((archive = archive_read_new()) == NULL) { RET_ERR(PM_ERR_LIBARCHIVE, -1); } @@ -700,6 +708,7 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count, archive_read_support_compression_all(archive); archive_read_support_format_all(archive); + _alpm_log(PM_LOG_DEBUG, "archive: %s\n", newpkg->origin_data.file); if(archive_read_open_filename(archive, newpkg->origin_data.file, ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) { RET_ERR(PM_ERR_PKG_OPEN, -1); -- 1.5.4.5 -- K. Piche <kpiche(a)rogers.com>

2 1

[pacman-dev] be_files.c work
by K. Piche 14 Apr '08

14 Apr '08

Added functions to read standard types from db files. This is the first patch in a larger work to follow eventually. >From 84a7a5db2dc58a1ae800075d3acd604d18c86747 Mon Sep 17 00:00:00 2001 From: K. Piche <kevin(a)archlinux.org> Date: Sun, 13 Apr 2008 22:54:37 -0400 Subject: [PATCH] Add helper functions to read standard types from package database files. Signed-off-by: K. Piche <kevin(a)archlinux.org> --- lib/libalpm/be_files.c | 305 +++++++++++++++++++++++++++++++----------------- 1 files changed, 197 insertions(+), 108 deletions(-) diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index 7cc01c2..7d78296 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -244,6 +244,134 @@ pmpkg_t *_alpm_db_scan(pmdb_t *db, const char *target) return(pkg); } + + +/********** db file type parsing **********/ + + + +/** + * @brief Read a string from a package's db file. + * @param fp File to read from. + * @param pstr pointer to char pointer to store the string. + * @return 0 for success or -1 for failure. + */ +int _alpm_db_read_string(FILE *fp, char **pstr) +{ + char line[512]; + + ALPM_LOG_FUNC; + + if(fgets(line, 512, fp) == NULL) { + return(-1); + } + + STRDUP(*pstr, _alpm_strtrim(line), return(-1)); + + return(0); +} + + +/** + * @brief Read a long from a package's db file. + * @param fp File to read from. + * @param plong pointer to long to store the input. + * @return 0 for success or -1 for failure. + */ +int _alpm_db_read_long(FILE *fp, unsigned long *plong) +{ + char line[512]; + + ALPM_LOG_FUNC; + + if(fgets(line, 512, fp) == NULL) { + return(-1); + } + + *plong = atol(_alpm_strtrim(line)); + + return(0); +} + + +/** + * @brief Read a list of strings from a package's db file. + * @param fp File to read from. + * @param plist pointer to alpm_list_t pointer to store the list. + * @return 0 for success or -1 for failure. + */ +int _alpm_db_read_list(FILE *fp, alpm_list_t **plist) +{ + char line[512]; + + ALPM_LOG_FUNC; + + /* FIXME no error return */ + while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + char *linedup; + STRDUP(linedup, _alpm_strtrim(line), return(-1)); + *plist = alpm_list_add(*plist, linedup); + } + + return(0); +} + + +/** + * @brief Read a pmdepend_t list from a package's db file. + * @param fp File to read from. + * @param pdlist pointer to alpm_list_t pointer to store the dependencies. + * @return 0 for success or -1 for failure. + */ +int _alpm_db_read_deplist(FILE *fp, alpm_list_t **pdlist) +{ + char line[512]; + + ALPM_LOG_FUNC; + + /* FIXME no error return */ + while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + pmdepend_t *dep = _alpm_splitdep(_alpm_strtrim(line)); + *pdlist = alpm_list_add(*pdlist, dep); + } + + return(0); +} + + +/** + * @brief Read a date from a package's db file. + * @param fp File to read from. + * @param pdate pointer to a long to store the date. + * @return 0 for success or -1 for failure. + */ +int _alpm_db_read_date(FILE *fp, long *pdate) +{ + char line[512]; + + ALPM_LOG_FUNC; + + if(fgets(line, 512, fp) == NULL) { + return(-1); + } + _alpm_strtrim(line); + + char first = tolower(line[0]); + if(first > 'a' && first < 'z') { + struct tm tmp_tm = {0}; /* Initialize to null incase of failure. */ + setlocale(LC_TIME, "C"); + strptime(line, "%a %b %e %H:%M:%S %Y", &tmp_tm); + *pdate = mktime(&tmp_tm); + setlocale(LC_TIME, ""); + } else { + *pdate = atol(line); + } + + return(0); +} + + + int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) { FILE *fp = NULL; @@ -297,123 +425,89 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) _alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno)); goto error; } + while(!feof(fp)) { if(fgets(line, 256, fp) == NULL) { break; } _alpm_strtrim(line); if(strcmp(line, "%FILENAME%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - STRDUP(info->filename, _alpm_strtrim(line), goto error); + + if (_alpm_db_read_string(fp, &info->filename)) goto error; + } else if(strcmp(line, "%DESC%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - STRDUP(info->desc, _alpm_strtrim(line), goto error); + + if (_alpm_db_read_string(fp, &info->desc)) goto error; + } else if(strcmp(line, "%GROUPS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->groups = alpm_list_add(info->groups, linedup); - } + + if (_alpm_db_read_list(fp, &info->groups)) goto error; + } else if(strcmp(line, "%URL%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - STRDUP(info->url, _alpm_strtrim(line), goto error); + + if (_alpm_db_read_string(fp, &info->url)) goto error; + } else if(strcmp(line, "%LICENSE%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->licenses = alpm_list_add(info->licenses, linedup); - } + + if (_alpm_db_read_list(fp, &info->licenses)) goto error; + } else if(strcmp(line, "%ARCH%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - STRDUP(info->arch, _alpm_strtrim(line), goto error); + + if (_alpm_db_read_string(fp, &info->arch)) goto error; + } else if(strcmp(line, "%BUILDDATE%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - _alpm_strtrim(line); - char first = tolower(line[0]); - if(first > 'a' && first < 'z') { - struct tm tmp_tm = {0}; //initialize to null incase of failure - setlocale(LC_TIME, "C"); - strptime(line, "%a %b %e %H:%M:%S %Y", &tmp_tm); - info->builddate = mktime(&tmp_tm); - setlocale(LC_TIME, ""); - } else { - info->builddate = atol(line); - } + if (_alpm_db_read_date(fp, &info->builddate)) goto error; + } else if(strcmp(line, "%INSTALLDATE%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - _alpm_strtrim(line); - char first = tolower(line[0]); - if(first > 'a' && first < 'z') { - struct tm tmp_tm = {0}; //initialize to null incase of failure - setlocale(LC_TIME, "C"); - strptime(line, "%a %b %e %H:%M:%S %Y", &tmp_tm); - info->installdate = mktime(&tmp_tm); - setlocale(LC_TIME, ""); - } else { - info->installdate = atol(line); - } + if (_alpm_db_read_date(fp, &info->installdate)) goto error; + } else if(strcmp(line, "%PACKAGER%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - STRDUP(info->packager, _alpm_strtrim(line), goto error); + + if (_alpm_db_read_string(fp, &info->packager)) goto error; + } else if(strcmp(line, "%REASON%") == 0) { - if(fgets(line, 512, fp) == NULL) { - goto error; - } - info->reason = atol(_alpm_strtrim(line)); + + unsigned long tempreason; + if (_alpm_db_read_long(fp, &tempreason)) goto error; + info->reason = tempreason; + } else if(strcmp(line, "%SIZE%") == 0 || strcmp(line, "%CSIZE%") == 0) { + /* NOTE: the CSIZE and SIZE fields both share the "size" field * in the pkginfo_t struct. This can be done b/c CSIZE * is currently only used in sync databases, and SIZE is * only used in local databases. */ - if(fgets(line, 512, fp) == NULL) { - goto error; - } - info->size = atol(_alpm_strtrim(line)); + if (_alpm_db_read_long(fp, &info->size)) goto error; + /* also store this value to isize if isize is unset */ if(info->isize == 0) { info->isize = info->size; } + } else if(strcmp(line, "%ISIZE%") == 0) { + /* ISIZE (installed size) tag only appears in sync repositories, * not the local one. */ - if(fgets(line, 512, fp) == NULL) { - goto error; - } - info->isize = atol(_alpm_strtrim(line)); + if (_alpm_db_read_long(fp, &info->isize)) goto error; + } else if(strcmp(line, "%MD5SUM%") == 0) { + /* MD5SUM tag only appears in sync repositories, * not the local one. */ - if(fgets(line, 512, fp) == NULL) { - goto error; - } - STRDUP(info->md5sum, _alpm_strtrim(line), goto error); + if (_alpm_db_read_string(fp, &info->md5sum)) goto error; + } else if(strcmp(line, "%REPLACES%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->replaces = alpm_list_add(info->replaces, linedup); - } + + if (_alpm_db_read_list(fp, &info->replaces)) goto error; + } else if(strcmp(line, "%FORCE%") == 0) { info->force = 1; } } + fclose(fp); fp = NULL; } @@ -425,22 +519,20 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) _alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno)); goto error; } + while(fgets(line, 256, fp)) { _alpm_strtrim(line); if(strcmp(line, "%FILES%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->files = alpm_list_add(info->files, linedup); - } + + if (_alpm_db_read_list(fp, &info->files)) goto error; + } else if(strcmp(line, "%BACKUP%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->backup = alpm_list_add(info->backup, linedup); - } + + if (_alpm_db_read_list(fp, &info->backup)) goto error; + } } + fclose(fp); fp = NULL; } @@ -452,34 +544,29 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) _alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno)); goto error; } + while(!feof(fp)) { fgets(line, 255, fp); _alpm_strtrim(line); if(strcmp(line, "%DEPENDS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - pmdepend_t *dep = _alpm_splitdep(_alpm_strtrim(line)); - info->depends = alpm_list_add(info->depends, dep); - } + + if (_alpm_db_read_deplist(fp, &info->depends)) goto error; + } else if(strcmp(line, "%OPTDEPENDS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->optdepends = alpm_list_add(info->optdepends, linedup); - } + + if (_alpm_db_read_list(fp, &info->optdepends)) goto error; + } else if(strcmp(line, "%CONFLICTS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->conflicts = alpm_list_add(info->conflicts, linedup); - } + + if (_alpm_db_read_list(fp, &info->conflicts)) goto error; + } else if(strcmp(line, "%PROVIDES%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - char *linedup; - STRDUP(linedup, _alpm_strtrim(line), goto error); - info->provides = alpm_list_add(info->provides, linedup); - } + + if (_alpm_db_read_list(fp, &info->provides)) goto error; + } } + fclose(fp); fp = NULL; } @@ -489,6 +576,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) snprintf(path, PATH_MAX, "%s/%s-%s/deltas", db->path, info->name, info->version); if((fp = fopen(path, "r"))) { + while(!feof(fp)) { fgets(line, 255, fp); _alpm_strtrim(line); @@ -498,6 +586,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) } } } + fclose(fp); fp = NULL; } -- 1.5.5 -- K. Piche <kpiche(a)rogers.com>

1 0

[pacman-dev] .pacnew created when not needed, was: [signoff] openssh 5.0p1
by Roman Kyrylych 11 Apr '08

11 Apr '08

2008/4/10, Xavier <shiningxc(a)gmail.com>: > On Thu, Apr 10, 2008 at 9:23 AM, Roman Kyrylych > <roman.kyrylych(a)gmail.com> wrote: > > > > Hmm.. > > pacman created /etc/ssh/sshd_config.pacnew, but I didn't modify > > sshd_config, so I wonder why pacman didn't just overwrite it. :-/ > > > > > Could you keep your /etc/ssh/sshd_config file, downgrade openssh to > the older version, then check the output of pacman -Qii openssh ? > And check the md5sum manually if needed. > > If it tells you sshd_config is indeed not modified, try upgrading > again, using --debug this time, and check the debug output of pacman. I've deleted that file already. But I had an older snapshot so I've tried to reproduce the issue again. And I got it clearly reproduceable: 0) I have clean install from 0.4 archboot iso (IIRC) in vmware with pacman 3.1.3 and no openssh, only some packages were upgraded, so package database is not broken 1) pacman -S openssh --noconfirm --debug > install.log 2) pacman -Syu only upgrading pacman from 3.1.3 to 3.1.4 3) pacman -S openssh --noconfirm --debug > upgrade.log (upgrading from 4.7 to 5.0 where default sshd_config was chaged) 4) ls /etc/ssh/ moduli ssh_config sshd_config sshd_config.pacnew 5) pacman -Qii openssh | grep -A3 Backup > Qii.txt Logs are attached. As can be seen from upgrade.log pacman makes a wrong decission when comparing existing, new and original md5sums (original is empty). I'm keeping that old snapshot so I can reproduce the issue again if more debugging is needed. -- Roman Kyrylych (Роман Кирилич)

3 5

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.1.4-106-gee2bbb3
by Dan McGee 11 Apr '08

11 Apr '08

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 ee2bbb39b52e9a62bc295792339ff46e245fad19 (commit) via 4bd0a850953b97cdf6ee6b96871302d9ceb2bcec (commit) via e9a0d35d088d89e26c7dd2820a2f61359d213700 (commit) via 4b7f7e2a59457aa881ae883b6d102f9fc62e2ed8 (commit) from 57acfced0d1b0d6fdff34bf778c92f04c9814a52 (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 ee2bbb39b52e9a62bc295792339ff46e245fad19 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Apr 8 18:54:25 2008 -0500 Memory allocation and other small cleanups Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4bd0a850953b97cdf6ee6b96871302d9ceb2bcec Merge: e9a0d35d088d89e26c7dd2820a2f61359d213700 4b7f7e2a59457aa881ae883b6d102f9fc62e2ed8 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Apr 10 20:54:34 2008 -0500 Merge branch 'maint' commit e9a0d35d088d89e26c7dd2820a2f61359d213700 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Apr 10 20:53:28 2008 -0500 Remove unnecessary import in dload.h We no longer expose any of libdownload in our public functions, so no need to include this header anymore. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 28 ++++++++++++---------------- lib/libalpm/dload.h | 1 - 2 files changed, 12 insertions(+), 17 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.1.4-4-g4b7f7e2
by Dan McGee 11 Apr '08

11 Apr '08

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 4b7f7e2a59457aa881ae883b6d102f9fc62e2ed8 (commit) from bec2ba5b4005053ce8f7048fa825ed58e3adfdc2 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] libdownload portability
by Sebastian Nowicki 10 Apr '08

10 Apr '08

I'm looking into making a package manager for Mac OSX and I'd like to use libalpm but currently it doesn't compile. I haven't tested this on any real BSD systems but OS X is based on BSD so I assume it also doesn't compile on BSD either. libdownload fails to co,pile because it can't find libio.h, which appears to be a part of glibc on Linux. I know Aaron forked libfetch and added some features, so I'm wondering if it's possible to port those features back to BSD. If it is, I'd be willing to look into doing so, but since my experience with C is low I don't know how that will work out. For any BSD users, is there an alternative to libio.h, hopefully with a similar API, that would work with libdownload?

2 2

[pacman-dev] added some comments to _alpm_unpack
by K. Piche 10 Apr '08

10 Apr '08

>From 2ded6c6f0a30eb10cf811ff70db6e0f1c62a6b50 Mon Sep 17 00:00:00 2001 From: K. Piche <kevin(a)archlinux.org> Date: Tue, 8 Apr 2008 23:30:46 -0400 Subject: [PATCH] Some comments for _alpm_unpack. Signed-off-by: K. Piche <kevin(a)archlinux.org> --- lib/libalpm/util.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 9d86331..9f431ed 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -370,6 +370,13 @@ int _alpm_lckrm() /* Compression functions */ +/** + * @brief Unpack a specific file or all files in an archive. + * + * @param archive the archive to unpack + * @param prefix where to extract the files + * @param fn a file within the archive to unpack or NULL for all + */ int _alpm_unpack(const char *archive, const char *prefix, const char *fn) { int ret = 1; @@ -407,13 +414,17 @@ int _alpm_unpack(const char *archive, const char *prefix, const char *fn) archive_entry_set_mode(entry, 0755); } + /* If a specific file was requested skip entries that don't match. */ if (fn && strcmp(fn, entryname)) { + _alpm_log(PM_LOG_DEBUG, "skipping: %s\n", entryname); if (archive_read_data_skip(_archive) != ARCHIVE_OK) { ret = 1; goto cleanup; } continue; } + + /* Extract the archive entry. */ ret = 0; snprintf(expath, PATH_MAX, "%s/%s", prefix, entryname); archive_entry_set_pathname(entry, expath); -- 1.5.4.5 -- K. Piche <kpiche(a)rogers.com>

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.1.4-3-gbec2ba5
by Dan McGee 08 Apr '08

08 Apr '08

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 bec2ba5b4005053ce8f7048fa825ed58e3adfdc2 (commit) via 9441fba12430f568b8b7456fcbe54d4c8a42d24d (commit) via b3f4bd9750821787d179340b0d1c7a5490276c10 (commit) from 0b8abf376f4a34d18aed450642284d9410522667 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: configure.ac | 4 ++-- contrib/pacdiff | 2 +- src/pacman/.gitignore | 1 + src/pacman/callback.c | 10 ++++++++++ src/util/.gitignore | 3 +++ 5 files changed, 17 insertions(+), 3 deletions(-) hooks/post-receive -- The official pacman repository

1 0