pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/shells/ast-ksh Fix up patches, applying each change on...
details: https://anonhg.NetBSD.org/pkgsrc/rev/29da68c229b1
branches: trunk
changeset: 641567:29da68c229b1
user: joerg <joerg%pkgsrc.org@localhost>
date: Tue Nov 11 15:40:37 2014 +0000
description:
Fix up patches, applying each change once is enough.
diffstat:
shells/ast-ksh/distinfo | 14 +-
shells/ast-ksh/patches/patch-src_lib_libast_features_lib | 15 +-
shells/ast-ksh/patches/patch-src_lib_libast_features_map.c | 18 +--
shells/ast-ksh/patches/patch-src_lib_libast_features_sys | 14 +-
shells/ast-ksh/patches/patch-src_lib_libast_features_vmalloc | 15 +-
shells/ast-ksh/patches/patch-src_lib_libast_include_vmalloc.h | 47 +-----
shells/ast-ksh/patches/patch-src_lib_libast_vmalloc_malloc.c | 93 +----------
7 files changed, 13 insertions(+), 203 deletions(-)
diffs (293 lines):
diff -r 9970d342a3d6 -r 29da68c229b1 shells/ast-ksh/distinfo
--- a/shells/ast-ksh/distinfo Tue Nov 11 15:39:37 2014 +0000
+++ b/shells/ast-ksh/distinfo Tue Nov 11 15:40:37 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2014/11/11 15:39:37 joerg Exp $
+$NetBSD: distinfo,v 1.18 2014/11/11 15:40:37 joerg Exp $
SHA1 (INIT.2012-08-01.tgz) = 0b472a615db384fe707042baaa3347dc1aa1c81e
RMD160 (INIT.2012-08-01.tgz) = 48f1830bc85a26125dd986256d38be435668d445
@@ -8,9 +8,9 @@
Size (ast-ksh.2012-08-01.tgz) = 2053532 bytes
SHA1 (patch-ab) = 98ec5d5e90f3f9bf45bdbd7199f85e932e07eada
SHA1 (patch-ad) = a85c7ac72c3443e4c140ee36bbc35b2a4eb42062
-SHA1 (patch-src_lib_libast_features_lib) = e29cb947625acc30409e37dca0e476a0b35e815f
-SHA1 (patch-src_lib_libast_features_map.c) = 22338c168c2611cc477b12ff7e11e4e3d92f4d98
-SHA1 (patch-src_lib_libast_features_sys) = 17346fa3c436f7c0c17445605b620353783cb530
-SHA1 (patch-src_lib_libast_features_vmalloc) = b8923f254b8f45d49f3d622685251c104559bf4b
-SHA1 (patch-src_lib_libast_include_vmalloc.h) = ac38a74cc64f73ae2b5a73d73bc5cf5e3aa8912d
-SHA1 (patch-src_lib_libast_vmalloc_malloc.c) = 8f8339b1c4ae2a688f76620010f4244042cde59d
+SHA1 (patch-src_lib_libast_features_lib) = 28bee8d00364a415c46bef63899329bc3326fe34
+SHA1 (patch-src_lib_libast_features_map.c) = efc25164d5e153ee3fc3b519d4d2abbc7c3f2f6b
+SHA1 (patch-src_lib_libast_features_sys) = 32a3f793395bb06e23c58e31ef534415da0d626b
+SHA1 (patch-src_lib_libast_features_vmalloc) = 714b1437cac8f49618581c6284a362163b37feba
+SHA1 (patch-src_lib_libast_include_vmalloc.h) = 165a39666a4f9c155e8c1af6220e351ac3b8189a
+SHA1 (patch-src_lib_libast_vmalloc_malloc.c) = 1256ade4a1bee59dccde6c549736a84bf14f0ae4
diff -r 9970d342a3d6 -r 29da68c229b1 shells/ast-ksh/patches/patch-src_lib_libast_features_lib
--- a/shells/ast-ksh/patches/patch-src_lib_libast_features_lib Tue Nov 11 15:39:37 2014 +0000
+++ b/shells/ast-ksh/patches/patch-src_lib_libast_features_lib Tue Nov 11 15:40:37 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_lib_libast_features_lib,v 1.2 2014/11/10 18:02:53 joerg Exp $
+$NetBSD: patch-src_lib_libast_features_lib,v 1.3 2014/11/11 15:40:37 joerg Exp $
--- src/lib/libast/features/lib.orig 2014-11-06 01:38:59.000000000 +0000
+++ src/lib/libast/features/lib
@@ -11,16 +11,3 @@
lib readlink,remove,rename,rewinddir,rindex,rmdir,setlocale
lib setpgid,setpgrp,setpgrp2,setreuid,setsid,setuid,sigaction
lib sigprocmask,sigsetmask,sigunblock,sigvec,socketpair
-$NetBSD: patch-src_lib_libast_features_lib,v 1.2 2014/11/10 18:02:53 joerg Exp $
-
---- src/lib/libast/features/lib.orig 2014-11-06 01:38:59.000000000 +0000
-+++ src/lib/libast/features/lib
-@@ -28,7 +28,7 @@ lib getopt,getsubopt,getopt_long,getopt_
- lib glob,index,iswblank,iswctype,killpg,link,localeconv,madvise
- lib mbtowc,mbrtowc,memalign,memchr,memcpy,memdup,memmove,memset
- lib mkdir,mkfifo,mktemp,mktime
--lib mount,on_exit,onexit,opendir,pathconf
-+lib mount,on_exit,onexit,opendir,pathconf,posix_memalign
- lib readlink,remove,rename,rewinddir,rindex,rmdir,setlocale
- lib setpgid,setpgrp,setpgrp2,setreuid,setsid,setuid,sigaction
- lib sigprocmask,sigsetmask,sigunblock,sigvec,socketpair
diff -r 9970d342a3d6 -r 29da68c229b1 shells/ast-ksh/patches/patch-src_lib_libast_features_map.c
--- a/shells/ast-ksh/patches/patch-src_lib_libast_features_map.c Tue Nov 11 15:39:37 2014 +0000
+++ b/shells/ast-ksh/patches/patch-src_lib_libast_features_map.c Tue Nov 11 15:40:37 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_lib_libast_features_map.c,v 1.2 2014/11/10 18:02:53 joerg Exp $
+$NetBSD: patch-src_lib_libast_features_map.c,v 1.3 2014/11/11 15:40:37 joerg Exp $
--- src/lib/libast/features/map.c.orig 2010-06-25 16:59:08.000000000 +0000
+++ src/lib/libast/features/map.c
@@ -14,19 +14,3 @@
#if _lib_mstats
printf("#undef mstats\n");
printf("#define mstats _ast_mstats\n");
-$NetBSD: patch-src_lib_libast_features_map.c,v 1.2 2014/11/10 18:02:53 joerg Exp $
-
---- src/lib/libast/features/map.c.orig 2010-06-25 16:59:08.000000000 +0000
-+++ src/lib/libast/features/map.c
-@@ -432,6 +432,11 @@ main()
- printf("#define memalign _ast_memalign\n");
- printf("extern void* memalign(size_t, size_t);\n");
- #endif
-+#if _lib_posix_memalign
-+ printf("#undef posix_memalign\n");
-+ printf("#define posix_memalign _ast_posix_memalign\n");
-+ printf("extern int posix_memalign(void **, size_t, size_t);\n");
-+#endif
- #if _lib_mstats
- printf("#undef mstats\n");
- printf("#define mstats _ast_mstats\n");
diff -r 9970d342a3d6 -r 29da68c229b1 shells/ast-ksh/patches/patch-src_lib_libast_features_sys
--- a/shells/ast-ksh/patches/patch-src_lib_libast_features_sys Tue Nov 11 15:39:37 2014 +0000
+++ b/shells/ast-ksh/patches/patch-src_lib_libast_features_sys Tue Nov 11 15:40:37 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_lib_libast_features_sys,v 1.2 2014/11/10 18:02:53 joerg Exp $
+$NetBSD: patch-src_lib_libast_features_sys,v 1.3 2014/11/11 15:40:37 joerg Exp $
--- src/lib/libast/features/sys.orig 2012-06-15 02:11:26.000000000 +0000
+++ src/lib/libast/features/sys
@@ -10,15 +10,3 @@
extern pvalloc void* (size_t)
extern qsort void (void*, size_t, size_t, int(*)(const void*, const void*))
extern rand int (void)
-$NetBSD: patch-src_lib_libast_features_sys,v 1.2 2014/11/10 18:02:53 joerg Exp $
-
---- src/lib/libast/features/sys.orig 2012-06-15 02:11:26.000000000 +0000
-+++ src/lib/libast/features/sys
-@@ -224,6 +224,7 @@ extern memset void* (void*, int, size_
- extern pathconf long (const char*, int)
- extern pause int (void)
- extern pipe int (int[])
-+extern posix_memalign int (void**,size_t, size_t)
- extern pvalloc void* (size_t)
- extern qsort void (void*, size_t, size_t, int(*)(const void*, const void*))
- extern rand int (void)
diff -r 9970d342a3d6 -r 29da68c229b1 shells/ast-ksh/patches/patch-src_lib_libast_features_vmalloc
--- a/shells/ast-ksh/patches/patch-src_lib_libast_features_vmalloc Tue Nov 11 15:39:37 2014 +0000
+++ b/shells/ast-ksh/patches/patch-src_lib_libast_features_vmalloc Tue Nov 11 15:40:37 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_lib_libast_features_vmalloc,v 1.2 2014/11/10 18:02:53 joerg Exp $
+$NetBSD: patch-src_lib_libast_features_vmalloc,v 1.3 2014/11/11 15:40:37 joerg Exp $
--- src/lib/libast/features/vmalloc.orig 2014-11-06 01:39:22.000000000 +0000
+++ src/lib/libast/features/vmalloc
@@ -11,16 +11,3 @@
lib _malloc,__malloc,__libc_malloc
hdr alloca,malloc,stat,stdlib,unistd
mem mallinfo.arena,mstats.bytes_total malloc.h
-$NetBSD: patch-src_lib_libast_features_vmalloc,v 1.2 2014/11/10 18:02:53 joerg Exp $
-
---- src/lib/libast/features/vmalloc.orig 2014-11-06 01:39:22.000000000 +0000
-+++ src/lib/libast/features/vmalloc
-@@ -9,7 +9,7 @@
- ref -D_def_map_ast=1
-
- lib atexit,getpagesize,mallinfo,mallopt,memalign,mstats
--lib onexit,pvalloc,strdup,valloc,vmalloc
-+lib onexit,posix_memalign,pvalloc,strdup,valloc,vmalloc
- lib _malloc,__malloc,__libc_malloc
- hdr alloca,malloc,stat,stdlib,unistd
- mem mallinfo.arena,mstats.bytes_total malloc.h
diff -r 9970d342a3d6 -r 29da68c229b1 shells/ast-ksh/patches/patch-src_lib_libast_include_vmalloc.h
--- a/shells/ast-ksh/patches/patch-src_lib_libast_include_vmalloc.h Tue Nov 11 15:39:37 2014 +0000
+++ b/shells/ast-ksh/patches/patch-src_lib_libast_include_vmalloc.h Tue Nov 11 15:40:37 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_lib_libast_include_vmalloc.h,v 1.2 2014/11/10 18:02:53 joerg Exp $
+$NetBSD: patch-src_lib_libast_include_vmalloc.h,v 1.3 2014/11/11 15:40:37 joerg Exp $
--- src/lib/libast/include/vmalloc.h.orig 2014-11-06 00:44:20.000000000 +0000
+++ src/lib/libast/include/vmalloc.h
@@ -43,48 +43,3 @@
#define valloc(s) (_VMFL_(Vmregion), _VMNM_(vallo,/,*,*,/,c)\
((size_t)(s) )
#ifndef strdup
-$NetBSD: patch-src_lib_libast_include_vmalloc.h,v 1.2 2014/11/10 18:02:53 joerg Exp $
-
---- src/lib/libast/include/vmalloc.h.orig 2014-11-06 00:44:20.000000000 +0000
-+++ src/lib/libast/include/vmalloc.h
-@@ -199,6 +199,7 @@ extern void free _ARG_(( Void_t* ));
- extern void cfree _ARG_(( Void_t* ));
- extern Void_t* calloc _ARG_(( size_t, size_t ));
- extern Void_t* memalign _ARG_(( size_t, size_t ));
-+extern int posix_memalign _ARG_(( Void_t **, size_t, size_t ));
- extern Void_t* valloc _ARG_(( size_t ));
- #endif
- extern int setregmax _ARG_(( int ));
-@@ -247,6 +248,7 @@ _END_EXTERNS_
- #undef calloc
- #undef free
- #undef memalign
-+#undef posix_memalign
- #undef valloc
-
- #if _map_malloc
-@@ -256,6 +258,7 @@ _END_EXTERNS_
- #define calloc(n,s) (_VMFL_(Vmregion), _ast_calloc((size_t)n, (size_t)(s)) )
- #define free(d) (_VMFL_(Vmregion), _ast_free((Void_t*)(d)) )
- #define memalign(a,s) (_VMFL_(Vmregion), _ast_memalign((size_t)(a),(size_t)(s)) )
-+#define posix_memalign(p,a,s) (_VMFL_(Vmregion), _ast_posix_memalign((Void_t**)(p),(size_t)(a),(size_t)(s)) )
- #define valloc(s) (_VMFL_(Vmregion), _ast_valloc((size_t)(s) )
-
- #else
-@@ -269,6 +272,7 @@ _END_EXTERNS_
- #define calloc(n,s) (_VMFL_(Vmregion), calloc((size_t)n, (size_t)(s)) )
- #define free(d) (_VMFL_(Vmregion), free((Void_t*)(d)) )
- #define memalign(a,s) (_VMFL_(Vmregion), memalign((size_t)(a),(size_t)(s)) )
-+#define posix_memalign(p,a,s) (_VMFL_(Vmregion), posix_memalign((Void_t**)(p),(size_t)(a),(size_t)(s)) )
- #define valloc(s) (_VMFL_(Vmregion), valloc((size_t)(s) )
- #ifndef strdup
- #define strdup(s) ( _VMFL_(Vmregion), (strdup)((char*)(s)) )
-@@ -286,6 +290,8 @@ _END_EXTERNS_
- #define free(d) (_VMFL_(Vmregion), _VMNM_(fre,/,*,*,/,e)((Void_t*)(d)) )
- #define memalign(a,s) (_VMFL_(Vmregion), _VMNM_(memalig,/,*,*,/,n)\
- ((size_t)(a),(size_t)(s)) )
-+#define posix_memalign(p,a,s) (_VMFL_(Vmregion), _VMNM_(posix_memalig,/,*,*,/,n)\
-+ ((Void_t**)(p),(size_t)(a),(size_t)(s)) )
- #define valloc(s) (_VMFL_(Vmregion), _VMNM_(vallo,/,*,*,/,c)\
- ((size_t)(s) )
- #ifndef strdup
diff -r 9970d342a3d6 -r 29da68c229b1 shells/ast-ksh/patches/patch-src_lib_libast_vmalloc_malloc.c
--- a/shells/ast-ksh/patches/patch-src_lib_libast_vmalloc_malloc.c Tue Nov 11 15:39:37 2014 +0000
+++ b/shells/ast-ksh/patches/patch-src_lib_libast_vmalloc_malloc.c Tue Nov 11 15:40:37 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_lib_libast_vmalloc_malloc.c,v 1.2 2014/11/10 18:02:53 joerg Exp $
+$NetBSD: patch-src_lib_libast_vmalloc_malloc.c,v 1.3 2014/11/11 15:40:37 joerg Exp $
--- src/lib/libast/vmalloc/malloc.c.orig 2012-06-28 06:52:46.000000000 +0000
+++ src/lib/libast/vmalloc/malloc.c
@@ -89,94 +89,3 @@
extern Void_t* F2(_ast_realloc, Void_t*,p, size_t,n) { return realloc(p, n); }
#endif
-$NetBSD: patch-src_lib_libast_vmalloc_malloc.c,v 1.2 2014/11/10 18:02:53 joerg Exp $
-
---- src/lib/libast/vmalloc/malloc.c.orig 2012-06-28 06:52:46.000000000 +0000
-+++ src/lib/libast/vmalloc/malloc.c
-@@ -61,6 +61,10 @@ extern char* getenv(const char*);
- #undef mallinfo
- typedef struct ______mallinfo Mallinfo_t;
- #undef mallopt
-+#undef memalign
-+#define memalign _ast_memalign
-+#undef posix_memalign
-+#define posix_memalign _ast_posix_memalign
- #undef mstats
- typedef struct ______mstats Mstats_t;
- #undef realloc
-@@ -153,6 +157,7 @@ static int _Vmpffd = -1;
- #undef malloc
- #undef mallopt
- #undef memalign
-+#undef posix_memalign
- #undef mstats
- #undef realloc
- #undef valloc
-@@ -166,6 +171,7 @@ static int _Vmpffd = -1;
- #undef free
- #undef malloc
- #undef memalign
-+#undef posix_memalign
- #undef realloc
-
- #define calloc _ast_calloc
-@@ -173,6 +179,7 @@ static int _Vmpffd = -1;
- #define free _ast_free
- #define malloc _ast_malloc
- #define memalign _ast_memalign
-+#define posix_memalign _ast_posix_memalign
- #define realloc _ast_realloc
-
- #endif
-@@ -847,6 +854,9 @@ extern Void_t* F1(_malloc, size_t,n) { r
- #if _lib_memalign
- extern Void_t* F2(_memalign, size_t,a, size_t,n) { return memalign(a, n); }
- #endif
-+#if _lib_posix_memalign
-+extern Void_t* F2(_posix_memalign, size_t,a, size_t,n) { return posix_memalign(a, n); }
-+#endif
- #if _lib_pvalloc
- extern Void_t* F1(_pvalloc, size_t,n) { return pvalloc(n); }
- #endif
-@@ -864,6 +874,9 @@ extern Void_t* F1(__malloc, size_t,n) {
- #if _lib_memalign
- extern Void_t* F2(__memalign, size_t,a, size_t,n) { return memalign(a, n); }
- #endif
-+#if _lib_posix_memalign
-+extern Void_t* F2(__posix_memalign, size_t,a, size_t,n) { return posix_memalign(a, n); }
-+#endif
- #if _lib_pvalloc
- extern Void_t* F1(__pvalloc, size_t,n) { return pvalloc(n); }
- #endif
-@@ -881,6 +894,9 @@ extern Void_t* F1(__libc_malloc, size_t,
- #if _lib_memalign
- extern Void_t* F2(__libc_memalign, size_t,a, size_t,n) { return memalign(a, n); }
- #endif
-+#if _lib_posix_memalign
-+extern Void_t* F2(__libc_posix_memalign, size_t,a, size_t,n) { return posix_memalign(a, n); }
-+#endif
- #if _lib_pvalloc
- extern Void_t* F1(__libc_pvalloc, size_t,n) { return pvalloc(n); }
- #endif
-@@ -1015,6 +1031,11 @@ extern Void_t* malloc _ARG_((size_t));
- extern Void_t* memalign _ARG_((size_t, size_t));
- #endif
-
-+#if _lib_posix_memalign
-+#undef posix_memalign
-+extern Void_t* posix_memalign _ARG_((size_t, size_t));
-+#endif
-+
- #if _lib_pvalloc
- #undef pvalloc
- extern Void_t* pvalloc _ARG_((size_t));
-@@ -1039,6 +1060,9 @@ extern Void_t* F1(_ast_malloc, size_t,n)
- #if _lib_memalign
- extern Void_t* F2(_ast_memalign, size_t,a, size_t,n) { return memalign(a, n); }
- #endif
-+#if _lib_posix_memalign
-+extern Void_t* F2(_ast_posix_memalign, size_t,a, size_t,n) { return memalign(a, n); }
-+#endif
- extern Void_t* F2(_ast_realloc, Void_t*,p, size_t,n) { return realloc(p, n); }
-
- #endif
Home |
Main Index |
Thread Index |
Old Index