bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Imported from pacman-2.7.2.tar.gz

Browse source
This commit is contained in:
Judd Vinet 2004-01-04 17:53:32 +00:00
parent 68e24b947e
commit 6d4c666a8e
10 changed files with 1119 additions and 1109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
VERSION DESCRIPTION
-----------------------------------------------------------------------------
2.7.2 - Supressed "No such file" messages during stripping
- Removed extra newlines in /var/log/pacman.log
- Added a --noextract option to makepkg to skip source extraction
2.7.1 - Fixed a couple obscure segfaults
- LogFiles were logging incorrect dates - fixed
- Cleaned up md5sum output in makepkg -g

2
Makefile.in
View file

@ -34,7 +34,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
PACVER = 2.7.1
PACVER = 2.7.2
TOPDIR = @srcdir@
SRCDIR = $(TOPDIR)/src/

20
TODO
View file

@ -1,17 +1,15 @@
- think about consolidating the -A/-U/-S options into one smart
install operation
- replaces code doesn't run with -U or -A
- when performing replaces, pacman should not remove old packages until
the conflict checks are passed
- --info should work with --sync to display dependencies
- add an ETA to the download progress bar
- add HTTP/1.1 support
- fix the broken pipe bug
- handle version comparators in makepkg dep resolution (eg, glibc>=2.2.5)
- add post_remove, pre_install, pre_upgrade functions to scriptlets
- record md5sums of all files in a package
? record md5sums of all files in a package
? use 'set -e' in makepkg?
x if a package fails, ask before aborting the full operation
- can't -- further dependent packages may fail b/c of the first failure
- check $PACCONF env var
? use a 'trust pacman' config option for downgrading?
? build-time (source) dependencies in makepkg
? run ldd on every executable in a newly built package to find required so's
- add a --pretend option
- add a consistency/sanity check operation (md5 tracking for all files)
- use package caches more for performance
- clean up output a bit (message queue?)
- use a files.cache db for --owns and db_find_conflicts

6
libftp/ftplib.c
View file

@ -88,7 +88,7 @@ struct NetBuf {
};
static char *version =
"ftplib Release 3.1-1 9/16/00, copyright 1996-2000 Thomas Pfau";
"ftplib Release 3.1-1 9/16/00, copyright 1996-2000 Thomas Pfau";
GLOBALDEF int ftplib_debug = 0;
@ -101,9 +101,9 @@ GLOBALDEF int ftplib_debug = 0;
#define net_write(x,y,z) send(x,y,z,0)
#define net_close closesocket
#endif
#if defined(NEED_MEMCCPY)
/*
/*
* VAX C does not supply a memccpy routine so I provide my own
*/
void *memccpy(void *dest, const void *src, int c, size_t n)

2
scripts/gensync
View file

@ -20,7 +20,7 @@
# USA.
#
myver='2.7.1'
myver='2.7.2'
usage() {
echo "gensync $myver"

22
scripts/makepkg
View file

@ -20,7 +20,7 @@
# USA.
#
myver='2.7.1'
myver='2.7.2'
startdir=`pwd`
USE_COLOR="n"
@ -178,6 +178,7 @@ usage() {
echo " -c, --clean Clean up work files after build"
echo " -C, --cleancache Clean up source files from the cache"
echo " -d, --nodeps Skip all dependency checks"
echo " -e, --noextract Do not extract source files (use existing src/ dir)"
echo " -f, --force Overwrite existing package"
echo " -g, --genmd5 Generate MD5sums for source files"
echo " -h, --help This help"
@ -204,6 +205,7 @@ DEP_BIN=0
DEP_SRC=0
NODEPS=0
FORCE=0
NOEXTRACT=0
NOSTRIP=0
RMDEPS=0
PKGDEST=$startdir
@ -218,6 +220,7 @@ while [ "$#" -ne "0" ]; do
--syncdeps) DEP_BIN=1 ;;
--builddeps) DEP_SRC=1 ;;
--nodeps) NODEPS=1 ;;
--noextract) NOEXTRACT=1 ;;
--install) INSTALL=1 ;;
--force) FORCE=1 ;;
--nostrip) NOSTRIP=1 ;;
@ -233,13 +236,14 @@ while [ "$#" -ne "0" ]; do
exit 1
;;
-*)
while getopts "cCsbdhifgmnrp:w:-" opt; do
while getopts "cCsbdehifgmnrp:w:-" opt; do
case $opt in
c) CLEANUP=1 ;;
C) CLEANCACHE=1 ;;
s) DEP_BIN=1 ;;
b) DEP_SRC=1 ;;
d) NODEPS=1 ;;
e) NOEXTRACT=1 ;;
i) INSTALL=1 ;;
g) GENMD5=1 ;;
f) FORCE=1 ;;
@ -414,7 +418,10 @@ for netfile in ${source[@]}; do
done
if [ "$GENMD5" = "0" ]; then
# MD5 validation
if [ "$NOEXTRACT" = "1" ]; then
warning "Skipping source extraction -- using existing src/ tree"
else
# MD5 validation
if [ ${#md5sums[@]} -ne ${#source[@]} ]; then
warning "MD5sums are missing or incomplete. Cannot verify source integrity."
#sleep 1
@ -442,7 +449,7 @@ if [ "$GENMD5" = "0" ]; then
warning "The md5sum program is missing. Cannot verify source files!"
sleep 1
fi
# extract sources
# extract sources
msg "Extracting Sources..."
for netfile in ${source[@]}; do
file=`strip_url $netfile`
@ -471,6 +478,7 @@ if [ "$GENMD5" = "0" ]; then
fi
fi
done
fi
else
# generate md5 hashes
if [ ! `type -p md5sum` ]; then
@ -518,7 +526,7 @@ fi
# check for existing pkg directory
if [ -d $startdir/pkg ]; then
msg "Removing existing pkg directory..."
msg "Removing existing pkg/ directory..."
rm -rf $startdir/pkg
fi
mkdir -p $startdir/pkg
@ -573,9 +581,9 @@ cd $startdir
# strip binaries
if [ "$NOSTRIP" = "0" ]; then
msg "Stripping debugging symbols from libraries..."
find pkg/{,usr,usr/local,opt/*}/lib -type f -exec /usr/bin/strip --strip-debug '{}' \; 2>&1
find pkg/{,usr,usr/local,opt/*}/lib -type f -exec /usr/bin/strip --strip-debug '{}' \; 2>&1 | grep -v "No such file"
msg "Stripping symbols from binaries..."
find pkg/{,usr,usr/local,opt/*}/{bin,sbin} -type f -exec /usr/bin/strip '{}' \; 2>&1
find pkg/{,usr,usr/local,opt/*}/{bin,sbin} -type f -exec /usr/bin/strip '{}' \; 2>&1 | grep -v "No such file"
fi
# get some package meta info

2
scripts/makeworld
View file

@ -21,7 +21,7 @@
#
toplevel=`pwd`
version="2.7.1"
version="2.7.2"
usage() {
echo "makeworld version $version"

35
src/pacman.c
View file

@ -912,14 +912,14 @@ int pacman_sync(pacdb_t *db, PMList *targets)
/* no cache directory.... try creating it */
snprintf(parent, PATH_MAX, "%svar/cache/pacman", pmo_root);
logaction(stderr, "warning: no %s cache exists. creating...\n", ldir);
logaction(stderr, "warning: no %s cache exists. creating...", ldir);
oldmask = umask(0000);
mkdir(parent, 0755);
if(mkdir(ldir, 0755)) {
/* couldn't mkdir the cache directory, so fall back to /tmp and unlink
* the package afterwards.
*/
logaction(stderr, "warning: couldn't create package cache, using /tmp instead\n");
logaction(stderr, "warning: couldn't create package cache, using /tmp instead");
snprintf(ldir, PATH_MAX, "/tmp");
varcache = 0;
}
@ -1382,7 +1382,7 @@ int pacman_add(pacdb_t *db, PMList *targets)
temp = strdup("/tmp/pacman_XXXXXX");
mkstemp(temp);
if(tar_extract_file(tar, temp)) {
logaction(stderr, "could not extract %s: %s\n", pathname, strerror(errno));
logaction(stderr, "could not extract %s: %s", pathname, strerror(errno));
errors++;
continue;
}
@ -1419,13 +1419,13 @@ int pacman_add(pacdb_t *db, PMList *targets)
char newpath[PATH_MAX];
snprintf(newpath, PATH_MAX, "%s.pacorig", expath);
if(rename(expath, newpath)) {
logaction(stderr, "error: could not rename %s: %s\n", expath, strerror(errno));
logaction(stderr, "error: could not rename %s: %s", expath, strerror(errno));
}
if(copyfile(temp, expath)) {
logaction(stderr, "error: could not copy %s to %s: %s\n", temp, expath, strerror(errno));
logaction(stderr, "error: could not copy %s to %s: %s", temp, expath, strerror(errno));
errors++;
} else {
logaction(stderr, "warning: %s saved as %s\n", expath, newpath);
logaction(stderr, "warning: %s saved as %s", expath, newpath);
}
}
} else if(md5_orig) {
@ -1452,9 +1452,9 @@ int pacman_add(pacdb_t *db, PMList *targets)
installnew = 1;
snprintf(newpath, PATH_MAX, "%s.pacsave", expath);
if(rename(expath, newpath)) {
logaction(stderr, "error: could not rename %s: %s\n", expath, strerror(errno));
logaction(stderr, "error: could not rename %s: %s", expath, strerror(errno));
} else {
logaction(stderr, "warning: %s saved as %s\n", expath, newpath);
logaction(stderr, "warning: %s saved as %s", expath, newpath);
}
}
@ -1478,11 +1478,11 @@ int pacman_add(pacdb_t *db, PMList *targets)
} else {
vprint("%s is in NoUpgrade - skipping\n", pathname);
strncat(expath, ".pacnew", PATH_MAX);
logaction(stderr, "warning: extracting %s%s as %s\n", pmo_root, pathname, expath);
logaction(stderr, "warning: extracting %s%s as %s", pmo_root, pathname, expath);
/*tar_skip_regfile(tar);*/
}
if(tar_extract_file(tar, expath)) {
logaction(stderr, "could not extract %s: %s\n", pathname, strerror(errno));
logaction(stderr, "could not extract %s: %s", pathname, strerror(errno));
errors++;
}
/* calculate an md5 hash if this is in info->backup */
@ -1506,7 +1506,7 @@ int pacman_add(pacdb_t *db, PMList *targets)
tar_close(tar);
if(errors) {
ret = 1;
logaction(stderr, "errors occurred while %s %s\n",
logaction(stderr, "errors occurred while %s %s",
(pmo_upgrade ? "upgrading" : "installing"), info->name);
/* XXX: this "else" is disabled so the db_write() ALWAYS occurs. If it doesn't
@ -1541,7 +1541,7 @@ int pacman_add(pacdb_t *db, PMList *targets)
/* make an install date (in UTC) */
strncpy(info->installdate, asctime(gmtime(&t)), sizeof(info->installdate));
if(db_write(db, info)) {
logaction(stderr, "error updating database for %s!\n", info->name);
logaction(stderr, "error updating database for %s!", info->name);
return(1);
}
vprint("done.\n");
@ -1755,7 +1755,7 @@ int pacman_remove(pacdb_t *db, PMList *targets)
newpath = (char*)realloc(newpath, strlen(line)+strlen(".pacsave")+1);
sprintf(newpath, "%s.pacsave", line);
rename(line, newpath);
logaction(stderr, "warning: %s saved as %s\n", line, newpath);
logaction(stderr, "warning: %s saved as %s", line, newpath);
} else {
/*vprint(" unlinking %s\n", line);*/
if(unlink(line)) {
@ -1838,7 +1838,7 @@ int pacman_remove(pacdb_t *db, PMList *targets)
}
if(!pmo_upgrade) {
printf("done.\n");
logaction(NULL, "removed %s (%s)\n", info->name, info->version);
logaction(NULL, "removed %s (%s)", info->name, info->version);
}
}
@ -2427,7 +2427,7 @@ PMList* checkdeps(pacdb_t *db, unsigned short op, PMList *targets)
for(j = tp->depends; j; j = j->next) {
/* split into name/version pairs */
if(splitdep((char*)j->data, &depend)) {
logaction(stderr, "warning: invalid dependency in %s\n", (char*)tp->name);
logaction(stderr, "warning: invalid dependency in %s", (char*)tp->name);
continue;
}
found = 0;
@ -3019,7 +3019,8 @@ void logaction(FILE *fp, char *fmt, ...)
vsnprintf(msg, 1024, fmt, args);
va_end(args);
if(fp) {
fprintf(fp, "%s", msg);
fprintf(fp, "%s\n", msg);
fflush(fp);
}
if(pmo_usesyslog) {
syslog(LOG_WARNING, "%s", msg);
@ -3083,7 +3084,7 @@ void cleanup(int signum)
PMList *lp;
if(pm_access == READ_WRITE && lckrm(lckfile)) {
logaction(stderr, "warning: could not remove lock file %s\n", lckfile);
logaction(stderr, "warning: could not remove lock file %s", lckfile);
}
if(workfile) {
/* remove the current file being downloaded (as it's not complete) */

2
src/pacman.h
View file

@ -22,7 +22,7 @@
#define _PAC_PACMAN_H
#ifndef PACVER
#define PACVER "2.7.1"
#define PACVER "2.7.2"
#endif
#ifndef PKGDIR

2
src/pacsync.c
View file

@ -142,7 +142,7 @@ int downloadfiles(PMList *servers, char *localpath, PMList *files)
}
}
/* set up our progress bar's callback */
/* set up our progress bar's callback (and idle timeout) */
if(strcmp(server->protocol, "file")) {
FtpOptions(FTPLIB_CALLBACK, (long)log_progress, control);
FtpOptions(FTPLIB_IDLETIME, (long)1000, control);