diff options
| author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2014-05-20 12:20:06 +0300 |
|---|---|---|
| committer | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2014-05-20 12:20:06 +0300 |
| commit | 91bf3951728d557bdf3a68e25c830eafff28795e (patch) | |
| tree | 041d3026f122dae522ef25da49af5167e4b935bb | |
| parent | 0509ea12b6114da2f07b813577a93b6437954ed0 (diff) | |
| parent | 0e9bed20556284ad35f21f2adf26dc31ee8f6be9 (diff) | |
| download | pristine-tar-91bf3951728d557bdf3a68e25c830eafff28795e.tar.gz pristine-tar-91bf3951728d557bdf3a68e25c830eafff28795e.tar.bz2 pristine-tar-91bf3951728d557bdf3a68e25c830eafff28795e.zip | |
Merge tag '1.31' into devel
tagging package pristine-tar version 1.31
Conflicts:
debian/changelog
Change-Id: Ia4f7bdad3f0b64559b3f507fe8b7c79a1f3f37af
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | pristine-tar.spec | 2 | ||||
| -rw-r--r-- | zgz/zgz.c | 17 |
4 files changed, 20 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog index 6b6c6a7..385b2e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +pristine-tar (1.31) unstable; urgency=medium + + * Build on Hurd without needing PATH_MAX defined. Closes: #738670 + Thanks, Svante Signell + + -- Joey Hess <joeyh@debian.org> Wed, 23 Apr 2014 14:01:03 -0400 + pristine-tar (1.30-tizen20140227) unstable; urgency=low * Version bump to 1.30. diff --git a/debian/control b/debian/control index b7e2e76..abc2dad 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: utils Priority: optional Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.9.0), zlib1g-dev, perl Maintainer: Joey Hess <joeyh@debian.org> -Standards-Version: 3.9.3 +Standards-Version: 3.9.5 Vcs-Git: git://git.kitenet.net/pristine-tar/ Vcs-Browser: http://git.kitenet.net/?p=pristine-tar.git Homepage: http://kitenet.net/~joey/code/pristine-tar/ diff --git a/pristine-tar.spec b/pristine-tar.spec index ffb5e8d..e1b3cbe 100644 --- a/pristine-tar.spec +++ b/pristine-tar.spec @@ -1,5 +1,5 @@ Name: pristine-tar -Version: 1.30 +Version: 1.31 Release: 2%{?dist} Summary: regenerate pristine tarballs @@ -518,12 +518,14 @@ gz_compress(int in, int out, const char *origname, uint32_t mtime, int level, in static void shamble(char *zombie, int level) { - char exec_buf[PATH_MAX]; + char *exec_buf; char level_buf[3]; char *argv[3]; - int i; + int i, len; - snprintf(exec_buf, sizeof(exec_buf), "%s/%s", PKGLIBDIR, zombie); + len = strlen(PKGLIBDIR) + 1 + strlen(zombie) + 1; + exec_buf = malloc(len); + snprintf(exec_buf, len, "%s/%s", PKGLIBDIR, zombie); snprintf(level_buf, sizeof(level_buf), "-%i", level); i = 0; @@ -540,10 +542,10 @@ shamble(char *zombie, int level) static void rebrain(char *zombie, char *program, int level) { - char path_buf[PATH_MAX]; + char *path_buf; char level_buf[3]; char *argv[3]; - int i; + int i, len; #if defined(__APPLE__) && defined(__MACH__) # define LD_PATH_VAR "DYLD_LIBRARY_PATH" @@ -551,9 +553,12 @@ rebrain(char *zombie, char *program, int level) # define LD_PATH_VAR "LD_LIBRARY_PATH" #endif - snprintf(path_buf, sizeof(path_buf), "%s/%s", PKGLIBDIR, zombie); + len = strlen(PKGLIBDIR) + 1 + strlen(zombie) + 1; + path_buf = malloc(len); + snprintf(path_buf, len, "%s/%s", PKGLIBDIR, zombie); /* FIXME - should append, not overwrite */ setenv(LD_PATH_VAR, path_buf, 1); + free(path_buf); snprintf(level_buf, sizeof(level_buf), "-%i", level); |