emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added support for a cachedir to store downloaded binpkgs.

Browse Source 
libxbps:
 * Added xbps_set_cachedir() and xbps_get_cachedir(). By default it's
   set to /var/cache/xbps if not specified and it's always relative
   to the root directory.
 * Move mkpath() code from sync_remote_pkgidc.c into its own file mkpath.c
   to use it in another parts of the code.
 * Added xbps_get_binpkg_local_path(), that returns the local path to
   a binary package file, stored in cachedir or local repo.
 * Remote pkg index files are now stored directly in metadir/repodir,
   skipping the arch directory because binpkgs are now in cachedir.

xbps-bin:
 * Added -c flag to set the cachedir.
 * Check sha256 hashes in the download stage so that it can check
   a downloaded binpkg immediately once is stored.
 * If a binpkg doesn't match the hash it will be refetched.

Bump XBPS_RELVER to 20091128.

--HG--
extra : convert_revision : xtraeme%40gmail.com-20091128013841-kkcvk07lsqdr26w8
This commit is contained in:
Juan RP
2009-11-28 02:38:41 +01:00
parent 0d0e6d06b1
commit 494504dbec
9 changed files with 270 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Makefile
View File

@@ -17,7 +17,7 @@ LIBFETCH_OBJS = fetch/common.o fetch/fetch.o fetch/file.o fetch/ftp.o fetch/http
OBJS += configure.o cmpver.o depends.o download.o fexec.o findpkg.o
OBJS += humanize_number.o orphans.o plist.o purge.o register.o remove.o
OBJS += repository.o requiredby.o sha256.o sortdeps.o state.o
OBJS += sync_remote_pkgidx.o unpack.o util.o pkgmatch.o
OBJS += sync_remote_pkgidx.o unpack.o util.o pkgmatch.o mkpath.o
OBJS += regpkgs_dictionary.o repository_plist.o repository_pool.o
.PHONY: all

98
lib/mkpath.c Normal file
View File

@@ -0,0 +1,98 @@
/*
* Copyright (c) 1983, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
/*
* The following is a modified function from NetBSD's src/bin/mkdir/mkdir.c
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <sys/stat.h>
#include <xbps_api.h>
/*
* mkpath -- create directories.
* path - path
* mode - file mode of terminal directory
*/
int
xbps_mkpath(char *path, mode_t mode)
{
struct stat sb;
char *slash = path;
int done = 0, rv;
mode_t dir_mode;
/*
* The default file mode is a=rwx (0777) with selected permissions
* removed in accordance with the file mode creation mask. For
* intermediate path name components, the mode is the default modified
* by u+wx so that the subdirectories can always be created.
*/
if (mode == 0)
mode = (S_IRWXU | S_IRWXG | S_IRWXO) & ~umask(0);
dir_mode = mode | S_IWUSR | S_IXUSR;
for (;;) {
slash += strspn(slash, "/");
slash += strcspn(slash, "/");
done = (*slash == '\0');
*slash = '\0';
rv = mkdir(path, done ? mode : dir_mode);
if (rv < 0) {
/*
* Can't create; path exists or no perms.
* stat() path to determine what's there now.
*/
int sverrno;
sverrno = errno;
if (stat(path, &sb) < 0) {
/* Not there; use mkdir()s error */
errno = sverrno;
return -1;
}
if (!S_ISDIR(sb.st_mode)) {
/* Is there, but isn't a directory */
errno = ENOTDIR;
return -1;
}
}
if (done)
break;
*slash = '/';
}
return 0;
}

163
lib/sync_remote_pkgidx.c
View File

@@ -32,8 +32,6 @@
#include <xbps_api.h>
#include "fetch.h"
static int mkpath(char *, mode_t);
char SYMEXPORT *
xbps_get_remote_repo_string(const char *uri)
{
@@ -79,12 +77,12 @@ xbps_sync_repository_pkg_index(const char *uri)
struct utsname un;
struct stat st;
const char *fetch_outputdir;
char *rpidx, *dir, *lrepodir, *uri_fixedp;
char *rpidx, *lrepodir, *uri_fixedp;
char *metadir, *tmp_metafile, *lrepofile;
int rv = 0;
bool only_sync = false;
rpidx = dir = lrepodir = uri_fixedp = NULL;
rpidx = lrepodir = uri_fixedp = NULL;
metadir = tmp_metafile = lrepofile = NULL;
if (uname(&un) == -1)
@@ -100,7 +98,7 @@ xbps_sync_repository_pkg_index(const char *uri)
}
/*
* Create metadir if it doesn't exist yet.
* Create metadir if necessary.
*/
metadir = xbps_xasprintf("%s/%s", xbps_get_rootdir(),
XBPS_META_PATH);
@@ -108,17 +106,8 @@ xbps_sync_repository_pkg_index(const char *uri)
rv = -1;
goto out;
}
rv = stat(metadir, &st);
if (rv == -1 && errno == ENOENT) {
if (mkpath(metadir, 0755) == -1) {
rv = -1;
goto out;
}
} else if (rv == 0 && !S_ISDIR(st.st_mode)) {
errno = ENOTDIR;
rv = -1;
if ((rv = xbps_mkpath(metadir, 0755)) == -1)
goto out;
}
/*
* Remote repository pkg-index.plist full URL.
@@ -140,8 +129,8 @@ xbps_sync_repository_pkg_index(const char *uri)
/*
* Full path to machine arch local repository directory.
*/
lrepodir = xbps_xasprintf("%s/%s/%s/%s",
xbps_get_rootdir(), XBPS_META_PATH, uri_fixedp, un.machine);
lrepodir = xbps_xasprintf("%s/%s/%s",
xbps_get_rootdir(), XBPS_META_PATH, uri_fixedp);
if (lrepodir == NULL) {
rv = -1;
goto out;
@@ -168,52 +157,17 @@ xbps_sync_repository_pkg_index(const char *uri)
if (only_sync)
goto out;
/*
* Create local arch repodir:
*
* <rootdir>/var/db/xbps/repo/<url_path_blah>/<arch>
*/
rv = stat(lrepodir, &st);
if (rv == -1 && errno == ENOENT) {
if (mkpath(lrepodir, 0755) == -1) {
rv = -1;
goto out;
}
} else if (rv == 0 && !S_ISDIR(st.st_mode)) {
errno = ENOTDIR;
rv = -1;
goto out;
}
/*
* Create local noarch repodir:
*
* <rootdir>/var/db/xbps/repo/<url_path_blah>/noarch
*/
dir = xbps_xasprintf("%s/%s/%s/noarch",
xbps_get_rootdir(), XBPS_META_PATH, uri_fixedp);
if (dir == NULL) {
rv = -1;
goto out;
}
rv = stat(dir, &st);
if (rv == -1 && errno == ENOENT) {
if (mkpath(dir, 0755) == -1) {
free(dir);
rv = -1;
goto out;
}
} else if (rv == 0 && !S_ISDIR(st.st_mode)) {
free(dir);
errno = ENOTDIR;
rv = -1;
goto out;
}
free(dir);
lrepofile = xbps_xasprintf("%s/%s", lrepodir, XBPS_PKGINDEX);
if (lrepofile == NULL) {
rv = -1;
goto out;
}
/*
* Create local repodir to store pkg-index.plist file.
*/
if ((rv = xbps_mkpath(lrepodir, 0755)) == -1)
goto out;
/*
* Rename to destination file now it has been fetched successfully.
*/
@@ -238,96 +192,3 @@ out:
return rv;
}
/*
* The following is a modified function from NetBSD's src/bin/mkdir/mkdir.c
*/
/*
* Copyright (c) 1983, 1992, 1993
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
/*
* mkpath -- create directories.
* path - path
* mode - file mode of terminal directory
*/
static int
mkpath(char *path, mode_t mode)
{
struct stat sb;
char *slash = path;
int done = 0, rv;
mode_t dir_mode;
/*
* The default file mode is a=rwx (0777) with selected permissions
* removed in accordance with the file mode creation mask. For
* intermediate path name components, the mode is the default modified
* by u+wx so that the subdirectories can always be created.
*/
if (mode == 0)
mode = (S_IRWXU | S_IRWXG | S_IRWXO) & ~umask(0);
dir_mode = mode | S_IWUSR | S_IXUSR;
for (;;) {
slash += strspn(slash, "/");
slash += strcspn(slash, "/");
done = (*slash == '\0');
*slash = '\0';
rv = mkdir(path, done ? mode : dir_mode);
if (rv < 0) {
/*
* Can't create; path exists or no perms.
* stat() path to determine what's there now.
*/
int sverrno;
sverrno = errno;
if (stat(path, &sb) < 0) {
/* Not there; use mkdir()s error */
errno = sverrno;
return -1;
}
if (!S_ISDIR(sb.st_mode)) {
/* Is there, but isn't a directory */
errno = ENOTDIR;
return -1;
}
}
if (done)
break;
*slash = '/';
}
return 0;
}

17
lib/unpack.c
View File

@@ -39,30 +39,17 @@ static void set_extract_flags(int *);
int SYMEXPORT
xbps_unpack_binary_pkg(prop_dictionary_t pkg, bool essential)
{
prop_string_t filename, repoloc, arch;
struct archive *ar = NULL;
const char *pkgname;
struct archive *ar = NULL;
char *binfile = NULL;
int pkg_fd, rv = 0;
assert(pkg != NULL);
/*
* Append filename to the full path for binary pkg.
*/
if (!prop_dictionary_get_cstring_nocopy(pkg, "pkgname", &pkgname))
return errno;
filename = prop_dictionary_get(pkg, "filename");
arch = prop_dictionary_get(pkg, "architecture");
repoloc = prop_dictionary_get(pkg, "repository");
if (filename == NULL || arch == NULL || repoloc == NULL)
return ENOTSUP;
binfile = xbps_xasprintf("%s/%s/%s",
prop_string_cstring_nocopy(repoloc),
prop_string_cstring_nocopy(arch),
prop_string_cstring_nocopy(filename));
binfile = xbps_get_binpkg_local_path(pkg);
if (binfile == NULL)
return EINVAL;

67
lib/util.c
View File

@@ -41,6 +41,7 @@
static bool question(bool, const char *, va_list);
static const char *rootdir;
static const char *cachedir;
static int flags;
char SYMEXPORT *
@@ -298,7 +299,7 @@ xbps_get_pkgver_from_dict(prop_dictionary_t d)
}
static char *
get_pkg_index_remote_plist(const char *uri, const char *machine)
get_pkg_index_remote_plist(const char *uri)
{
char *uri_fixed, *repodir;
@@ -306,9 +307,8 @@ get_pkg_index_remote_plist(const char *uri, const char *machine)
if (uri_fixed == NULL)
return NULL;
repodir = xbps_xasprintf("%s/%s/%s/%s/%s",
xbps_get_rootdir(), XBPS_META_PATH, uri_fixed,
machine, XBPS_PKGINDEX);
repodir = xbps_xasprintf("%s/%s/%s/%s",
xbps_get_rootdir(), XBPS_META_PATH, uri_fixed, XBPS_PKGINDEX);
if (repodir == NULL) {
free(uri_fixed);
return NULL;
@@ -328,11 +328,34 @@ xbps_get_pkg_index_plist(const char *uri)
return NULL;
if (xbps_check_is_repo_string_remote(uri))
return get_pkg_index_remote_plist(uri, un.machine);
return get_pkg_index_remote_plist(uri);
return xbps_xasprintf("%s/%s/%s", uri, un.machine, XBPS_PKGINDEX);
}
char SYMEXPORT *
xbps_get_binpkg_local_path(prop_dictionary_t pkg)
{
const char *repoloc, *filen, *arch, *cdir;
if (!prop_dictionary_get_cstring_nocopy(pkg, "repository", &repoloc))
return NULL;
if (!prop_dictionary_get_cstring_nocopy(pkg, "filename", &filen))
return NULL;
if (!prop_dictionary_get_cstring_nocopy(pkg, "architecture", &arch))
return NULL;
cdir = xbps_get_cachedir();
if (cdir == NULL)
return NULL;
if (!xbps_check_is_repo_string_remote(repoloc)) {
/* local repo */
return xbps_xasprintf("%s/%s/%s", repoloc, arch, filen);
}
/* cachedir */
return xbps_xasprintf("%s/%s", cdir, filen);
}
bool SYMEXPORT
xbps_pkg_has_rundeps(prop_dictionary_t pkg)
{
@@ -362,6 +385,40 @@ xbps_get_rootdir(void)
return rootdir;
}
void SYMEXPORT
xbps_set_cachedir(const char *dir)
{
static char res[PATH_MAX];
int r = 0;
assert(dir != NULL);
r = snprintf(res, sizeof(res), "%s/%s", xbps_get_rootdir(), dir);
if (r == -1 || r >= (int)sizeof(res)) {
/* If error or truncated set to default */
cachedir = XBPS_CACHE_PATH;
return;
}
cachedir = res;
}
const char SYMEXPORT *
xbps_get_cachedir(void)
{
static char res[PATH_MAX];
int r = 0;
if (cachedir == NULL) {
r = snprintf(res, sizeof(res), "%s/%s",
xbps_get_rootdir(), XBPS_CACHE_PATH);
if (r == -1 || r >= (int)sizeof(res))
return NULL;
cachedir = res;
}
return cachedir;
}
void SYMEXPORT
xbps_set_flags(int lflags)
{