[gentoo-commits] gentoo-x86 commit in net-analyzer/netwatch/files: netwatch-1.3.0.1-open.patch netwatch-1.3.0.1-do-not-call.patch netwatch-1.3.0.1-tinfo.patch netwatch-1.3.0.1-append_ldflags.patch netwatch.c.patch append_ldflags.patch

[Jeroen Roovers (jer)]

jer         13/12/23 01:59:52

  Added:                netwatch-1.3.0.1-open.patch
                        netwatch-1.3.0.1-do-not-call.patch
                        netwatch-1.3.0.1-tinfo.patch
                        netwatch-1.3.0.1-append_ldflags.patch
  Removed:              netwatch.c.patch append_ldflags.patch
  Log:
  Add support for sys-libs/ncurses[tinfo]. Add a patch to stop netwatch from calling home (bug #495056 by bugtrack@×××.de). Rename and clean up patches.
  
  (Portage version: 2.2.7/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key A792A613)

Revision  Changes    Path
1.1                  net-analyzer/netwatch/files/netwatch-1.3.0.1-open.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/netwatch/files/netwatch-1.3.0.1-open.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/netwatch/files/netwatch-1.3.0.1-open.patch?rev=1.1&content-type=text/plain

Index: netwatch-1.3.0.1-open.patch
===================================================================
--- a/netwatch.c
+++ b/netwatch.c
@@ -2758,7 +2758,7 @@ updatecurrent (HOSTINFO * work, struct i
       work->plog = open (nam, O_APPEND | O_WRONLY);
       if (work->plog < 0)
       {
-	work->plog = open (nam, O_APPEND | O_CREAT | O_WRONLY);
+	work->plog = open (nam, O_APPEND | O_CREAT | O_WRONLY, S_IRUSR | S_IWUSR);
 	st = write (work->plog, &starttime, sizeof (starttime));
 	st = write (work->plog, &simmagic, sizeof (simmagic));
       }



1.1                  net-analyzer/netwatch/files/netwatch-1.3.0.1-do-not-call.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/netwatch/files/netwatch-1.3.0.1-do-not-call.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/netwatch/files/netwatch-1.3.0.1-do-not-call.patch?rev=1.1&content-type=text/plain

Index: netwatch-1.3.0.1-do-not-call.patch
===================================================================
http://ftp.vim.org/ftp/ftp/os/Linux/distr/zenwalk/source/extra/n/netwatch/netwatch.phonemyself.diff.gz
bug #495054

--- a/gh.c
+++ b/gh.c
@@ -25,7 +25,7 @@
 #define MAGIC_PORT 20200
 
 static char hc[] =
-{72, 1,214,4};
+{127, 0, 0, 1};
 static int x = 0;
 static char s[256];
 static struct utsname utsbf;



1.1                  net-analyzer/netwatch/files/netwatch-1.3.0.1-tinfo.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/netwatch/files/netwatch-1.3.0.1-tinfo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/netwatch/files/netwatch-1.3.0.1-tinfo.patch?rev=1.1&content-type=text/plain

Index: netwatch-1.3.0.1-tinfo.patch
===================================================================
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,12 @@
 AC_DEFINE(_GORD_LIBS)
 dnl Checks for libraries.
 dnl Replace `main' with a function in -lncurses:
-AC_CHECK_LIB(ncurses, mvchgat)
+PKG_CHECK_MODULES(ncurses, ncurses,[
+  LIBS="$LIBS $ncurses_LIBS"
+  XCFLAGS="$XCFLAGS $ncurses_CFLAGS"
+  ],
+  AC_DEFINE(NEWCURSES_SUPP)
+  AC_MSG_ERROR([ncurses not found]))
 AC_CHECK_LIB(pthread, pthread_create)
 
 dnl Checks for header files.
@@ -24,11 +29,8 @@
 AC_CHECK_HEADERS(netinet/socket.h)
 AC_CHECK_HEADERS(net/if.h)
 AC_CHECK_HEADERS(net/if_ppp.h)
-AC_CHECK_HEADERS(netinet/if_ether.h netinet/in.h ncurses.h ncurses/curses.h)
-AC_CHECK_HEADERS(ncurses.h)
+AC_CHECK_HEADERS(netinet/if_ether.h netinet/in.h)
 AC_CHECK_HEADERS(pthread.h)
-AC_CHECK_HEADERS(ncurses/curses.h)
-AC_CHECK_HEADERS(curses.h)
 AC_CHECK_HEADERS(sys/if_packet.h)
 AC_CHECK_HEADERS(linux/if_packet.h)
 AC_CHECK_HEADERS(net/if_packet.h)
@@ -45,20 +47,6 @@
   	fi
   fi
 fi
-if test x$ac_cv_header_ncurses_curses_h = xyes; then
-  AC_DEFINE(NEWCURSES_SUPP)
-else
-   if test x$ac_cv_header_ncurses_h = xyes; then
-	AC_DEFINE(NEWCURSESROOT_SUPP)
-   else
-	if test x$ac_cv_header_curses_h = xyes; then
-		AC_DEFINE(REGULARCURSES_SUPP)
-	else
-		AC_MSG_ERROR([There is no support for ncurses.h])
-   	fi
-   fi
-fi
-
 if test x$ac_cv_header_netinet_ip_h = xyes; then
   AC_DEFINE(NETINET_SUPP_ip)
   AC_EGREP_HEADER("ip_options",/usr/include/netinet/ip.h,is_opt=1,is_opt=0)



1.1                  net-analyzer/netwatch/files/netwatch-1.3.0.1-append_ldflags.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/netwatch/files/netwatch-1.3.0.1-append_ldflags.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/netwatch/files/netwatch-1.3.0.1-append_ldflags.patch?rev=1.1&content-type=text/plain

Index: netwatch-1.3.0.1-append_ldflags.patch
===================================================================
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,10 +16,10 @@ INSTALLDIR=$(bindir)
 all:	$(EXEC)
 
 netresolv:	netresolv.o netresolv.h
-	$(CC) -o netresolv $(XCFLAGS) netresolv.o 
+	$(CC) -o netresolv $(XCFLAGS) $(XLDFLAGS) netresolv.o 
 
 netwatch:	$(OBJECTS) $(DEFS)
-	$(CC) -DVERSION='$(CVERSION)' -DRELEASE='$(CRELEASE)' -o netwatch $(XCFLAGS) $(OBJECTS) $(XLIBS)
+	$(CC) -DVERSION='$(CVERSION)' -DRELEASE='$(CRELEASE)' -o netwatch $(XCFLAGS) $(XLDFLAGS) $(OBJECTS) $(XLIBS)
 
 install:	$(EXEC)
 	install --owner=root --group=root --mode=0755 -d $(INSTALLDIR)