File mode_t.dpatch of Package proftpd - j0ke.net Open Build Service

File mode_t.dpatch of Package proftpd (Revision 89c6d6d4e80cbf707719eff2c60f5f5d)

Currently displaying revision 89c6d6d4e80cbf707719eff2c60f5f5d, show latest

#! /bin/sh /usr/share/dpatch/dpatch-run
## mode_t.dpatch by Francesco Paolo Lovergine <frankie@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad trunk~/acconfig.h trunk/acconfig.h
--- trunk~/acconfig.h	2007-04-24 14:39:23.000000000 +0200
+++ trunk/acconfig.h	2007-10-15 22:49:32.000000000 +0200
@@ -12,9 +12,6 @@
 /* Define to `int' if <sys/types.h> doesn't define. */
 #undef ino_t
 
-/* Define to `mode_t' if <sys/types.h> doesn't define. */
-#undef umode_t
-
 /* Define to `int' if <sys/socket.h> doesn't define. */
 #undef socklen_t
 
diff -urNad trunk~/config.h.in trunk/config.h.in
--- trunk~/config.h.in	2007-10-09 23:45:04.000000000 +0200
+++ trunk/config.h.in	2007-10-15 22:50:25.000000000 +0200
@@ -37,9 +37,6 @@
 /* Define to `int' if <sys/socket.h> doesn't define. */
 #undef socklen_t
 
-/* Define to `mode_t' if <sys/types.h> doesn't define. */
-#undef umode_t
-
 /* Define if you have AIX send_file() semantics. */
 #undef HAVE_AIX_SENDFILE
 
diff -urNad trunk~/configure trunk/configure
--- trunk~/configure	2007-10-09 23:44:52.000000000 +0200
+++ trunk/configure	2007-10-15 22:55:26.000000000 +0200
@@ -30631,9 +30631,9 @@
 
 
 
-echo "$as_me:$LINENO: checking for umode_t" >&5
-echo $ECHO_N "checking for umode_t... $ECHO_C" >&6
-if test "${ac_cv_type_umode_t+set}" = set; then
+echo "$as_me:$LINENO: checking for mode_t" >&5
+echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
+if test "${ac_cv_type_mode_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -30646,9 +30646,9 @@
 int
 main ()
 {
-if ((umode_t *) 0)
+if ((mode_t *) 0)
   return 0;
-if (sizeof (umode_t))
+if (sizeof (mode_t))
   return 0;
   ;
   return 0;
@@ -30676,23 +30676,23 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_type_umode_t=yes
+  ac_cv_type_mode_t=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_type_umode_t=no
+ac_cv_type_mode_t=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_umode_t" >&5
-echo "${ECHO_T}$ac_cv_type_umode_t" >&6
-if test $ac_cv_type_umode_t = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
+echo "${ECHO_T}$ac_cv_type_mode_t" >&6
+if test $ac_cv_type_mode_t = yes; then
   :
 else
 
 cat >>confdefs.h <<_ACEOF
-#define umode_t mode_t
+#define mode_t mode_t
 _ACEOF
 
 fi
diff -urNad trunk~/configure.in trunk/configure.in
--- trunk~/configure.in	2007-10-09 23:45:03.000000000 +0200
+++ trunk/configure.in	2007-10-15 22:50:05.000000000 +0200
@@ -1118,7 +1118,7 @@
 AC_CHECK_SIZEOF(time_t, 0)
 
 dnl Check for generic typedefs
-AC_CHECK_TYPE(umode_t, mode_t)
+AC_CHECK_TYPE(mode_t, mode_t)
 AC_CHECK_TYPE(ino_t, ino_t)
 AC_CHECK_TYPE(intptr_t, AC_DEFINE(HAVE_INTPTR_T),, [
   #if HAVE_INTTYPES_H