summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /sys-apps/mtree/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sys-apps/mtree/files')
-rw-r--r--sys-apps/mtree/files/mtree-1.5-gcc4.patch29
-rw-r--r--sys-apps/mtree/files/mtree-2007.4+glibc-2.8.patch25
2 files changed, 54 insertions, 0 deletions
diff --git a/sys-apps/mtree/files/mtree-1.5-gcc4.patch b/sys-apps/mtree/files/mtree-1.5-gcc4.patch
new file mode 100644
index 000000000000..a57feed85085
--- /dev/null
+++ b/sys-apps/mtree/files/mtree-1.5-gcc4.patch
@@ -0,0 +1,29 @@
+Index: bootstrap-pkgsrc/digest/sha2.h
+===================================================================
+--- bootstrap-pkgsrc.orig/digest/sha2.h
++++ bootstrap-pkgsrc/digest/sha2.h
+@@ -99,21 +99,21 @@ void SHA256_Init(SHA256_CTX *);
+ void SHA256_Update(SHA256_CTX*, const u_int8_t*, size_t);
+ void SHA256_Final(u_int8_t[SHA256_DIGEST_LENGTH], SHA256_CTX*);
+ char* SHA256_End(SHA256_CTX*, u_char *);
+-char* SHA256_Data(const u_int8_t*, size_t, u_char *);
++char* SHA256_Data(const u_char*, size_t, u_char *);
+ char *SHA256_File(char *, char *);
+
+ void SHA384_Init(SHA384_CTX*);
+ void SHA384_Update(SHA384_CTX*, const u_int8_t*, size_t);
+ void SHA384_Final(u_int8_t[SHA384_DIGEST_LENGTH], SHA384_CTX*);
+ char* SHA384_End(SHA384_CTX*, char[SHA384_DIGEST_STRING_LENGTH]);
+-char* SHA384_Data(const u_int8_t*, size_t, char[SHA384_DIGEST_STRING_LENGTH]);
++char* SHA384_Data(const u_char*, size_t, char[SHA384_DIGEST_STRING_LENGTH]);
+ char *SHA384_File(char *, char *);
+
+ void SHA512_Init(SHA512_CTX*);
+ void SHA512_Update(SHA512_CTX*, const u_int8_t*, size_t);
+ void SHA512_Final(u_int8_t[SHA512_DIGEST_LENGTH], SHA512_CTX*);
+ char* SHA512_End(SHA512_CTX*, char[SHA512_DIGEST_STRING_LENGTH]);
+-char* SHA512_Data(const u_int8_t*, size_t, char[SHA512_DIGEST_STRING_LENGTH]);
++char* SHA512_Data(const u_char*, size_t, char[SHA512_DIGEST_STRING_LENGTH]);
+ char *SHA512_File(char *, char *);
+
+ #endif /* SHA2_USE_INTTYPES_H */
diff --git a/sys-apps/mtree/files/mtree-2007.4+glibc-2.8.patch b/sys-apps/mtree/files/mtree-2007.4+glibc-2.8.patch
new file mode 100644
index 000000000000..998715766f65
--- /dev/null
+++ b/sys-apps/mtree/files/mtree-2007.4+glibc-2.8.patch
@@ -0,0 +1,25 @@
+Index: pkgsrc/pkgtools/libnbcompat/files/nbcompat/limits.h
+===================================================================
+--- pkgsrc.orig/pkgtools/libnbcompat/files/nbcompat/limits.h
++++ pkgsrc/pkgtools/libnbcompat/files/nbcompat/limits.h
+@@ -43,6 +43,11 @@
+ # include <limits.h>
+ #endif
+
++/* Needed for glibc 2.8 */
++#ifdef HAVE_SYS_PARAM_H
++# include <sys/param.h>
++#endif
++
+ /*
+ * Declare functions and macros that may be missing in <limits.h>.
+ */
+@@ -77,4 +82,8 @@
+ # define UID_MAX 2147483647U /* max value for a uid_t (2^31-2) */
+ #endif
+
++#if !defined(ARG_MAX) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 8) )
++# define ARG_MAX sysconf(_SC_ARG_MAX)
++#endif
++
+ #endif /* !_NBCOMPAT_LIMITS_H_ */