X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=gnulib%2Fregenerate%2Fregenerate;h=d7f3a97c80985ed2a24666461d40b79580d58c1a;hb=b221e8dc16f345f8c8d7df8df71f4d36daaabb4c;hp=5669916877d155590ea73614af595138a9ddc032;hpb=2627875b7d18858bc1f9f7652811e4d8c15a23eb;p=debian%2Famanda

diff --git a/gnulib/regenerate/regenerate b/gnulib/regenerate/regenerate
old mode 100755
new mode 100644
index 5669916..d7f3a97
--- a/gnulib/regenerate/regenerate
+++ b/gnulib/regenerate/regenerate
@@ -4,7 +4,7 @@
 # same version as was used to generate the source in the repository,
 # run the following in your git repository:
 #
-#   git checkout 03400ebfaa064922caf3767d6641d7e1cdc8cd1b
+#   git checkout 09b8fa6cb737f6e091931c494cbd56d12b3ad08d
 
 # get to the project root
 cd `dirname $0`/../..
@@ -39,8 +39,10 @@ shopt -u nullglob
 ## Add your modules here, then see below if you need to patch them. ##
 ######################################################################
 
-GNULIB_MODULES="getaddrinfo lock visibility base64 physmem fsusage"
-GNULIB_MODULES="$GNULIB_MODULES mkdtemp getopt full-read full-write"
+GNULIB_MODULES="getaddrinfo lock base64 physmem fsusage"
+GNULIB_MODULES="$GNULIB_MODULES mkdtemp getopt-gnu full-read full-write"
+GNULIB_MODULES="$GNULIB_MODULES lseek ftruncate fseeko ftello regex environ"
+GNULIB_MODULES="$GNULIB_MODULES inet_pton"
 
 ######################################################################
 ## End modules                                                      ##
@@ -62,12 +64,11 @@ PATCH_DIR="`pwd`/gnulib/regenerate"
 
 # Patch Makefile.am to not error out on warnings
 patch -p0 < "${PATCH_DIR}/no-error.patch" || exit 1
+rm -f gnulib/Makefile.am.orig
 
-# Add John's patches to getaddrinfo.c for use in cygwin
-patch -p0 < "${PATCH_DIR}/getaddrinfo-cygwin.patch" || exit 1
-
-# Add John's patches to eliminate restrict attributes.
-patch -p0 < "${PATCH_DIR}/no-restrict.patch" || exit 1
+# Patch fsusage.h to not use 'bool', as it doesn't play nicely with
+# Perl on Mac OS X
+patch -p1 < "${PATCH_DIR}/fsusage-no-bool.patch" || exit 1
 
 # Add info to the makefile to ensure all this stuff gets put in
 # the distribution tarball
@@ -76,6 +77,10 @@ patch -p0 < "${PATCH_DIR}/no-restrict.patch" || exit 1
     echo "EXTRA_DIST += "`cd gnulib; find regenerate -name .svn -prune -o -type f -print | sort`
 ) >> gnulib/Makefile.am
 
+# remove .gitignore files, which ignore things we would like to see
+rm -f config/gnulib/.gitignore
+rm -f gnulib/.gitignore
+
 ######################################################################
 ## End patches                                                      ##
 ######################################################################