Date: Wed, 12 Apr 2006 07:09:26 +0000 (UTC) From: "Bjoern A. Zeeb" <bzeeb+freebsdports@zabbadoz.net> To: Emanuel Haupt <ehaupt@FreeBSD.org> Cc: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/93806: maintainer-update: emulators/hercules to 3.04 Message-ID: <20060412070108.B13011@maildrop.int.zabbadoz.net> In-Reply-To: <200604112218.k3BMIlnv078619@freefall.freebsd.org> References: <200604112218.k3BMIlnv078619@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, 12 Apr 2006, Emanuel Haupt wrote: > Could you maybe submit a patch (diff -Nur) including all the patches? Of course I can. Could you just take the PR when changing status? ;-) overview (files, changed,added,deleted): :/usr/ports/emulators/hercules> cvs -qR up -dPT M Makefile M distinfo M pkg-plist R files/patch-configure R files/patch-fbdcompile A files/patch-hercifc.h R files/patch-herconf M files/patch-tuntap A files/patch-tuntap-sin_len in case you want to fetch the diff use this URL: http://sources.zabbadoz.net/freebsd/ports/hercules-3.04-20060412.diff.shar or just http://sources.zabbadoz.net/freebsd/ports/hercules-3.04-20060412.diff # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # hercules-3.04-20060412.diff # echo x - hercules-3.04-20060412.diff sed 's/^X//' >hercules-3.04-20060412.diff << 'END-of-hercules-3.04-20060412.diff' XIndex: Makefile X=================================================================== XRCS file: /shared/mirror/FreeBSD/r/pcvs/ports/emulators/hercules/Makefile,v Xretrieving revision 1.16 Xdiff -u -p -r1.16 Makefile X--- Makefile 4 Feb 2006 22:19:02 -0000 1.16 X+++ Makefile 12 Apr 2006 07:01:34 -0000 X@@ -6,7 +6,7 @@ X # X X PORTNAME= hercules X-PORTVERSION= 3.03.1 X+PORTVERSION= 3.04 X CATEGORIES= emulators X MASTER_SITES= http://www.conmicro.cx/hercules/ X X@@ -52,8 +52,10 @@ CONFIGURE_ARGS+= --disable-fthreads X .endif X .if defined(WITHOUT_NLS) X CONFIGURE_ARGS+= --disable-nls X+PLIST_SUB+= GETTEXT="@comment " X .else X USE_GETTEXT= yes X+PLIST_SUB+= GETTEXT="" X .endif X X .include <bsd.port.post.mk> XIndex: distinfo X=================================================================== XRCS file: /shared/mirror/FreeBSD/r/pcvs/ports/emulators/hercules/distinfo,v Xretrieving revision 1.6 Xdiff -u -p -r1.6 distinfo X--- distinfo 4 Feb 2006 22:19:02 -0000 1.6 X+++ distinfo 12 Apr 2006 07:01:34 -0000 X@@ -1,4 +1,3 @@ X-MD5 (hercules-3.03.1.tar.gz) = 8576461fff6ed642fc69350826cf3c1d X-SHA256 (hercules-3.03.1.tar.gz) = f654785f1a12a39707ed66bc54b202dc70b90ecf3102660182d7f1ddddb7eba9 X-SIZE (hercules-3.03.1.tar.gz) = 2071850 X-SIZE (hercules-2.17.1.tar.gz) = 1172656 X+MD5 (hercules-3.04.tar.gz) = 7c7df7d52bf0365d5cbe051dc9e2e481 X+SHA256 (hercules-3.04.tar.gz) = 4512a7c2b86b4a92c337c99761295aa4eaa54e90da3d0881c283b69c03b1eed5 X+SIZE (hercules-3.04.tar.gz) = 2079774 XIndex: pkg-plist X=================================================================== XRCS file: /shared/mirror/FreeBSD/r/pcvs/ports/emulators/hercules/pkg-plist,v Xretrieving revision 1.3 Xdiff -u -p -r1.3 pkg-plist X--- pkg-plist 4 Feb 2006 22:19:02 -0000 1.3 X+++ pkg-plist 12 Apr 2006 07:01:34 -0000 X@@ -75,5 +75,5 @@ lib/hercules/hdtqeth.so X %%DATADIR%%/tapeconv.jcl X %%DATADIR%%/zzsacard.bin X @dirrm share/hercules X-share/locale/de/LC_MESSAGES/hercules.mo X-share/locale/nl/LC_MESSAGES/hercules.mo X+%%GETTEXT%%share/locale/de/LC_MESSAGES/hercules.mo X+%%GETTEXT%%share/locale/nl/LC_MESSAGES/hercules.mo XIndex: files/patch-configure X=================================================================== XRCS file: files/patch-configure Xdiff -N files/patch-configure X--- files/patch-configure 4 Feb 2006 22:28:16 -0000 1.1 X+++ /dev/null 1 Jan 1970 00:00:00 -0000 X@@ -1,257 +0,0 @@ X---- config.h.in.orig Thu Dec 29 03:37:47 2005 X-+++ config.h.in Wed Jan 25 20:05:14 2006 X-@@ -433,6 +433,9 @@ X- */ X- #undef HAVE_SYS_NDIR_H X- X-+/* Define to 1 if you have the <sys/param.h> header file. */ X-+#undef HAVE_SYS_PARAM_H X-+ X- /* Define to 1 if you have the <sys/resource.h> header file. */ X- #undef HAVE_SYS_RESOURCE_H X- X---- configure.orig Wed Jan 25 20:04:35 2006 X-+++ configure Wed Jan 25 20:05:14 2006 X-@@ -24562,6 +24562,14 @@ case "$host_os" in X- hc_cv_is_apple=no X- ;; X- X-+ freebsd*) X-+ X-+ hc_cv_is_nix=yes X-+ hc_cv_is_windows=no X-+ hc_cv_is_mingw32=no X-+ hc_cv_is_apple=no X-+ ;; X-+ X- mingw*) X- X- hc_cv_is_nix=no X-@@ -27941,6 +27949,158 @@ fi X- done X- X- X-+for ac_header in sys/param.h X-+do X-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` X-+if eval "test \"\${$as_ac_Header+set}\" = set"; then X-+ echo "$as_me:$LINENO: checking for $ac_header" >&5 X-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 X-+if eval "test \"\${$as_ac_Header+set}\" = set"; then X-+ echo $ECHO_N "(cached) $ECHO_C" >&6 X-+fi X-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 X-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 X-+else X-+ # Is the header compilable? X-+echo "$as_me:$LINENO: checking $ac_header usability" >&5 X-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 X-+cat >conftest.$ac_ext <<_ACEOF X-+/* confdefs.h. */ X-+_ACEOF X-+cat confdefs.h >>conftest.$ac_ext X-+cat >>conftest.$ac_ext <<_ACEOF X-+/* end confdefs.h. */ X-+$ac_includes_default X-+#include <$ac_header> X-+_ACEOF X-+rm -f conftest.$ac_objext X-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 X-+ (eval $ac_compile) 2>conftest.er1 X-+ ac_status=$? X-+ grep -v '^ *+' conftest.er1 >conftest.err X-+ rm -f conftest.er1 X-+ cat conftest.err >&5 X-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 X-+ (exit $ac_status); } && X-+ { ac_try='test -z "$ac_c_werror_flag" X-+ || test ! -s conftest.err' X-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 X-+ (eval $ac_try) 2>&5 X-+ ac_status=$? X-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 X-+ (exit $ac_status); }; } && X-+ { ac_try='test -s conftest.$ac_objext' X-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 X-+ (eval $ac_try) 2>&5 X-+ ac_status=$? X-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 X-+ (exit $ac_status); }; }; then X-+ ac_header_compiler=yes X-+else X-+ echo "$as_me: failed program was:" >&5 X-+sed 's/^/| /' conftest.$ac_ext >&5 X-+ X-+ac_header_compiler=no X-+fi X-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext X-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 X-+echo "${ECHO_T}$ac_header_compiler" >&6 X-+ X-+# Is the header present? X-+echo "$as_me:$LINENO: checking $ac_header presence" >&5 X-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 X-+cat >conftest.$ac_ext <<_ACEOF X-+/* confdefs.h. */ X-+_ACEOF X-+cat confdefs.h >>conftest.$ac_ext X-+cat >>conftest.$ac_ext <<_ACEOF X-+/* end confdefs.h. */ X-+#include <$ac_header> X-+_ACEOF X-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 X-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 X-+ ac_status=$? X-+ grep -v '^ *+' conftest.er1 >conftest.err X-+ rm -f conftest.er1 X-+ cat conftest.err >&5 X-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 X-+ (exit $ac_status); } >/dev/null; then X-+ if test -s conftest.err; then X-+ ac_cpp_err=$ac_c_preproc_warn_flag X-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag X-+ else X-+ ac_cpp_err= X-+ fi X-+else X-+ ac_cpp_err=yes X-+fi X-+if test -z "$ac_cpp_err"; then X-+ ac_header_preproc=yes X-+else X-+ echo "$as_me: failed program was:" >&5 X-+sed 's/^/| /' conftest.$ac_ext >&5 X-+ X-+ ac_header_preproc=no X-+fi X-+rm -f conftest.err conftest.$ac_ext X-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 X-+echo "${ECHO_T}$ac_header_preproc" >&6 X-+ X-+# So? What about this header? X-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in X-+ yes:no: ) X-+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 X-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} X-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 X-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} X-+ ac_header_preproc=yes X-+ ;; X-+ no:yes:* ) X-+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 X-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} X-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 X-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} X-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 X-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} X-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 X-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} X-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 X-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} X-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 X-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} X-+ ( X-+ cat <<\_ASBOX X-+## ------------------------------------------ ## X-+## Report this to the AC_PACKAGE_NAME lists. ## X-+## ------------------------------------------ ## X-+_ASBOX X-+ ) | X-+ sed "s/^/$as_me: WARNING: /" >&2 X-+ ;; X-+esac X-+echo "$as_me:$LINENO: checking for $ac_header" >&5 X-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 X-+if eval "test \"\${$as_ac_Header+set}\" = set"; then X-+ echo $ECHO_N "(cached) $ECHO_C" >&6 X-+else X-+ eval "$as_ac_Header=\$ac_header_preproc" X-+fi X-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 X-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 X-+ X-+fi X-+if test `eval echo '${'$as_ac_Header'}'` = yes; then X-+ cat >>confdefs.h <<_ACEOF X-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 X-+_ACEOF X-+ hc_cv_have_sys_param_h=yes X-+else X-+ hc_cv_have_sys_param_h=no X-+fi X-+ X-+done X-+ X-+ X- for ac_header in sys/mount.h X- do X- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` X-@@ -27963,6 +28123,11 @@ cat confdefs.h >>conftest.$ac_ext X- cat >>conftest.$ac_ext <<_ACEOF X- /* end confdefs.h. */ X- $ac_includes_default X-+ X-+ #if HAVE_SYS_PARAM_H X-+ #include <sys/param.h> X-+ #endif X-+ X- #include <$ac_header> X- _ACEOF X- rm -f conftest.$ac_objext X---- configure.ac.orig Thu Dec 29 19:47:06 2005 X-+++ configure.ac Wed Jan 25 20:05:14 2006 X-@@ -280,6 +280,14 @@ case "$host_os" in X- hc_cv_is_apple=no X- ;; X- X-+ freebsd*) X-+ X-+ hc_cv_is_nix=yes X-+ hc_cv_is_windows=no X-+ hc_cv_is_mingw32=no X-+ hc_cv_is_apple=no X-+ ;; X-+ X- mingw*) X- X- hc_cv_is_nix=no X-@@ -450,13 +458,24 @@ AC_CHECK_HEADERS( net/route.h, [hc_cv X- #include <sys/socket.h> X- #endif X- ] ) X-+ X-+#------------------------------------------------------------------------------ X-+# PROGRAMMING NOTE: on FreeBSD sys/param.h must be included before X-+# sys/mount.h. X-+AC_CHECK_HEADERS( sys/param.h, [hc_cv_have_sys_param_h=yes], [hc_cv_have_sys_param_h=no] ) X-+AC_CHECK_HEADERS( sys/mount.h, [hc_cv_have_sys_mount_h=yes], [hc_cv_have_sys_mount_h=no], X-+[ X-+ #if HAVE_SYS_PARAM_H X-+ #include <sys/param.h> X-+ #endif X-+] ) X-+ X- #------------------------------------------------------------------------------ X- X- AC_CHECK_HEADERS( arpa/inet.h, [hc_cv_have_arpa_inet_h=yes], [hc_cv_have_arpa_inet_h=no] ) X- AC_CHECK_HEADERS( linux/if_tun.h, [hc_cv_have_linux_if_tun_h=yes], [hc_cv_have_linux_if_tun_h=no] ) X- AC_CHECK_HEADERS( sys/ioctl.h, [hc_cv_have_sys_ioctl_h=yes], [hc_cv_have_sys_ioctl_h=no] ) X- AC_CHECK_HEADERS( sys/mman.h, [hc_cv_have_sys_mman_h=yes], [hc_cv_have_sys_mman_h=no] ) X--AC_CHECK_HEADERS( sys/mount.h, [hc_cv_have_sys_mount_h=yes], [hc_cv_have_sys_mount_h=no] ) X- AC_CHECK_HEADERS( sys/mtio.h, [hc_cv_have_sys_mtio_h=yes], [hc_cv_have_sys_mtio_h=no] ) X- AC_CHECK_HEADERS( sys/resource.h, [hc_cv_have_sys_resource_h=yes], [hc_cv_have_sys_resource_h=no] ) X- AC_CHECK_HEADERS( sys/uio.h, [hc_cv_have_sys_uio_h=yes], [hc_cv_have_sys_uio_h=no] ) X---- hstdinc.h.orig Wed Dec 7 13:42:19 2005 X-+++ hstdinc.h Wed Jan 25 20:05:14 2006 X-@@ -102,6 +102,11 @@ X- #ifdef HAVE_SYS_MMAN_H X- #include <sys/mman.h> X- #endif X-+/* PROGRAMMING NOTE: On FreeBSD, <sys/param.h> must be included before X-+ <sys/mount.h> */ X-+#ifdef HAVE_SYS_PARAM_H X-+ #include <sys/param.h> X-+#endif X- #ifdef HAVE_SYS_MOUNT_H X- #include <sys/mount.h> X- #endif XIndex: files/patch-fbdcompile X=================================================================== XRCS file: files/patch-fbdcompile Xdiff -N files/patch-fbdcompile X--- files/patch-fbdcompile 4 Feb 2006 22:28:16 -0000 1.1 X+++ /dev/null 1 Jan 1970 00:00:00 -0000 X@@ -1,36 +0,0 @@ X-! Found by: jemalloc X---- fillfnam.c.orig Sat Dec 3 13:49:43 2005 X-+++ fillfnam.c Wed Jan 25 20:05:14 2006 X-@@ -4,7 +4,7 @@ X- X- char *filterarray; X- X--int filter(const struct dirent *ent) { X-+int filter(struct dirent *ent) { X- if (filterarray == NULL) X- return(1); X- if (strncmp(ent->d_name, filterarray, strlen(filterarray)) == 0) X-@@ -50,7 +50,11 @@ int tab_pressed(char *cmdlinefull, int * X- strncpy(part2, cmdlinefull + i + 1, cmdoff - i - 1); X- part2[cmdoff - i - 1] = '\0'; X- X-- path = (char*)malloc(strlen(part2) + 1); X-+ len = strlen(part2); X-+ /* We need at least 2+1 characters for ./\0 in else path. */ X-+ if (len < 2) X-+ len = 2; X-+ path = (char*)malloc(len + 1); X- filename = part2; X- /* is it pure filename or is there whole path ? */ X- tmp = strrchr(part2, '/'); X---- hercifc.h.orig Thu Dec 1 17:37:25 2005 X-+++ hercifc.h Wed Jan 25 20:05:14 2006 X-@@ -88,7 +88,7 @@ typedef struct _CTLREQ X- union X- { X- struct ifreq ifreq; X--#if !defined(__APPLE__) X-+#if !defined(__APPLE__) && !defined(__FreeBSD__) X- struct rtentry rtentry; X- #endif X- } XIndex: files/patch-hercifc.h X=================================================================== XRCS file: files/patch-hercifc.h Xdiff -N files/patch-hercifc.h X--- /dev/null 1 Jan 1970 00:00:00 -0000 X+++ files/patch-hercifc.h 12 Apr 2006 07:01:34 -0000 X@@ -0,0 +1,14 @@ X+--- hercifc.h.orig Fri Feb 24 18:36:35 2006 X++++ hercifc.h Fri Feb 24 18:39:41 2006 X+@@ -77,7 +77,11 @@ X+ // -------------------------------------------------------------------- X+ X+ #define HERCIFC_CMD "hercifc" // Interface config command X++#if defined(__FreeBSD__) X++#define HERCTUN_DEV "/dev/tun" // Default TUN control dev X++#else X+ #define HERCTUN_DEV "/dev/net/tun" // Default TUN/TAP char dev X++#endif X+ X+ typedef struct _CTLREQ X+ { XIndex: files/patch-herconf X=================================================================== XRCS file: files/patch-herconf Xdiff -N files/patch-herconf X--- files/patch-herconf 4 Feb 2006 22:28:16 -0000 1.1 X+++ /dev/null 1 Jan 1970 00:00:00 -0000 X@@ -1,36 +0,0 @@ X---- hostopts.h.orig Wed Nov 30 23:46:13 2005 X-+++ hostopts.h Wed Jan 25 20:05:14 2006 X-@@ -199,6 +199,33 @@ X- #define HOW_TO_IMPLEMENT_SH_COMMAND USE_ANSI_SYSTEM_API_FOR_SH_COMMAND X- #define SET_CONSOLE_CURSOR_SHAPE_METHOD CURSOR_SHAPE_NOT_SUPPORTED X- X-+ X-+/*-------------------------------------------------------------------*/ X-+/* Hard-coded FreeBSD-specific features and options... */ X-+/*-------------------------------------------------------------------*/ X-+#elif defined(__FreeBSD__) /* "FreeBSD" options */ X-+ X-+#define DLL_IMPORT extern X-+#define DLL_EXPORT X-+ X-+#undef OPTION_SCSI_ERASE_TAPE /* (NOT supported) */ X-+#undef OPTION_SCSI_ERASE_GAP /* (NOT supported) */ X-+ X-+#undef OPTION_TUNTAP_SETMACADDR /* TUNTAP_SetMACAddr broken */ X-+#undef OPTION_TUNTAP_DELADD_ROUTES /* Del/Add Routes broken */ X-+ X-+#define MAX_DEVICE_THREADS 0 /* (0 == unlimited) */ X-+#define MIXEDCASE_FILENAMES_ARE_UNIQUE /* ("Foo" and "fOo" unique) */ X-+ X-+#define DEFAULT_HERCPRIO 0 X-+#define DEFAULT_TOD_PRIO -20 X-+#define DEFAULT_CPU_PRIO 15 X-+#define DEFAULT_DEV_PRIO 8 X-+ X-+#define HOW_TO_IMPLEMENT_SH_COMMAND USE_ANSI_SYSTEM_API_FOR_SH_COMMAND X-+#define SET_CONSOLE_CURSOR_SHAPE_METHOD CURSOR_SHAPE_NOT_SUPPORTED X-+ X-+ X- /*-------------------------------------------------------------------*/ X- /* Hard-coded OTHER host-specific features and options... */ X- /*-------------------------------------------------------------------*/ XIndex: files/patch-tuntap X=================================================================== XRCS file: /shared/mirror/FreeBSD/r/pcvs/ports/emulators/hercules/files/patch-tuntap,v Xretrieving revision 1.1 Xdiff -u -p -r1.1 patch-tuntap X--- files/patch-tuntap 4 Feb 2006 22:28:16 -0000 1.1 X+++ files/patch-tuntap 12 Apr 2006 07:01:34 -0000 X@@ -21,17 +21,6 @@ X PLCSSTDFRM pReply; X X pPort = &pLCSDEV->pLCSBLK->Port[pLCSDEV->bPort]; X---- hercifc.h.orig Thu Dec 1 17:37:25 2005 X-+++ hercifc.h Wed Jan 25 20:05:14 2006 X-@@ -77,7 +77,7 @@ X- // -------------------------------------------------------------------- X- X- #define HERCIFC_CMD "hercifc" // Interface config command X--#define HERCTUN_DEV "/dev/net/tun" // Default TUN/TAP char dev X-+#define HERCTUN_DEV "/dev/tun" // Default TUN/TAP char dev X- X- typedef struct _CTLREQ X- { X --- tuntap.c.orig Sun Dec 11 16:44:16 2005 X +++ tuntap.c Wed Jan 25 20:05:14 2006 X @@ -159,6 +159,25 @@ int TUNTAP_CreateInterface( XIndex: files/patch-tuntap-sin_len X=================================================================== XRCS file: files/patch-tuntap-sin_len Xdiff -N files/patch-tuntap-sin_len X--- /dev/null 1 Jan 1970 00:00:00 -0000 X+++ files/patch-tuntap-sin_len 12 Apr 2006 07:01:34 -0000 X@@ -0,0 +1,90 @@ X+--- ./tuntap.c.orig Sun Apr 9 12:00:35 2006 X++++ ./tuntap.c Sun Apr 9 12:01:35 2006 X+@@ -230,6 +230,7 @@ int TUNTAP_SetIPAddr( char* X+ sin = (struct sockaddr_in*)&ifreq.ifr_addr; X+ X+ sin->sin_family = AF_INET; X++ sin->sin_len = sizeof( struct sockaddr_in ); X+ X+ if( !pszNetDevName || !*pszNetDevName ) X+ { X+@@ -266,6 +267,7 @@ int TUNTAP_SetDestAddr( char X+ sin = (struct sockaddr_in*)&ifreq.ifr_addr; X+ X+ sin->sin_family = AF_INET; X++ sin->sin_len = sizeof( struct sockaddr_in ); X+ X+ if( !pszNetDevName || !*pszNetDevName ) X+ { X+@@ -302,6 +304,7 @@ int TUNTAP_SetNetMask( char* X+ sin = (struct sockaddr_in*)&ifreq.ifr_netmask; X+ X+ sin->sin_family = AF_INET; X++ sin->sin_len = sizeof( struct sockaddr_in ); X+ X+ if( !pszNetDevName || !*pszNetDevName ) X+ { X+@@ -339,6 +342,7 @@ int TUNTAP_SetMTU( char* p X+ sin = (struct sockaddr_in*)&ifreq.ifr_addr; X+ X+ sin->sin_family = AF_INET; X++ sin->sin_len = sizeof( struct sockaddr_in ); X+ X+ if( !pszNetDevName || !*pszNetDevName ) X+ { X+@@ -424,6 +428,7 @@ int TUNTAP_SetFlags ( char* X+ sin = (struct sockaddr_in*)&ifreq.ifr_addr; X+ X+ sin->sin_family = AF_INET; X++ sin->sin_len = sizeof( struct sockaddr_in ); X+ X+ if( !pszNetDevName || !*pszNetDevName ) X+ { X+@@ -465,6 +470,7 @@ int TUNTAP_AddRoute( char* p X+ X+ sin = (struct sockaddr_in*)&rtentry.rt_dst; X+ sin->sin_family = AF_INET; X++ sin->sin_len = sizeof( struct sockaddr_in ); X+ X+ if( !pszDestAddr || X+ !inet_aton( pszDestAddr, &sin->sin_addr ) ) X+@@ -476,6 +482,7 @@ int TUNTAP_AddRoute( char* p X+ X+ sin = (struct sockaddr_in*)&rtentry.rt_genmask; X+ sin->sin_family = AF_INET; X++ sin->sin_len = sizeof( struct sockaddr_in ); X+ X+ if( !pszNetMask || X+ !inet_aton( pszNetMask, &sin->sin_addr ) ) X+@@ -489,6 +496,7 @@ int TUNTAP_AddRoute( char* p X+ { X+ sin = (struct sockaddr_in*)&rtentry.rt_gateway; X+ sin->sin_family = AF_INET; X++ sin->sin_len = sizeof( struct sockaddr_in ); X+ X+ if( !inet_aton( pszGWAddr, &sin->sin_addr ) ) X+ { X+@@ -530,6 +538,7 @@ int TUNTAP_DelRoute( char* p X+ X+ sin = (struct sockaddr_in*)&rtentry.rt_dst; X+ sin->sin_family = AF_INET; X++ sin->sin_len = sizeof( struct sockaddr_in ); X+ X+ if( !pszDestAddr || X+ !inet_aton( pszDestAddr, &sin->sin_addr ) ) X+@@ -541,6 +550,7 @@ int TUNTAP_DelRoute( char* p X+ X+ sin = (struct sockaddr_in*)&rtentry.rt_genmask; X+ sin->sin_family = AF_INET; X++ sin->sin_len = sizeof( struct sockaddr_in ); X+ X+ if( !pszNetMask || X+ !inet_aton( pszNetMask, &sin->sin_addr ) ) X+@@ -552,6 +562,7 @@ int TUNTAP_DelRoute( char* p X+ X+ sin = (struct sockaddr_in*)&rtentry.rt_gateway; X+ sin->sin_family = AF_INET; X++ sin->sin_len = sizeof( struct sockaddr_in ); X+ X+ if( !pszGWAddr || X+ !inet_aton( pszGWAddr, &sin->sin_addr ) ) END-of-hercules-3.04-20060412.diff exit
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060412070108.B13011>