[nc] Switch to glibc b64_ntop() implementation

[Petr Šabata]

commit 10648feed48b16e14b69ca94aaf2a3e7babeae97
Author: Petr Šabata <contyk at redhat.com>
Date:   Thu May 31 14:01:51 2012 +0200

    Switch to glibc b64_ntop() implementation

 .gitignore |    1 +
 b64_ntop.c |  182 ------------------------------------------------------------
 nc.spec    |   11 ++-
 sources    |    2 +-
 4 files changed, 9 insertions(+), 187 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4b6ed6d..dc44ebf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ nc-1.84.tar.bz2
 /nc-1.105.tar.bz2
 /nc-1.106.tar.bz2
 /nc-1.107.tar.bz2
+/nc-1.107.20120403.tar.bz2
diff --git a/nc.spec b/nc.spec
index 5a1bb05..6a2789f 100644
--- a/nc.spec
+++ b/nc.spec
@@ -1,6 +1,7 @@
 Summary:    Reads and writes data across network connections using TCP or UDP
 Name:       nc
-Version:    1.107
+# CVS version of netcat.c + the checkout date
+Version:    1.107.20120403
 Release:    1%{?dist}
 URL:        http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/%{name}/
 License:    BSD and ISC
@@ -8,7 +9,6 @@ Group:      Applications/Internet
 # source is CVS checkout, e.g.:
 # CVSROOT=anoncvs at anoncvs.openbsd.org.ar:/cvs/src/usr.bin cvs checkout nc
 Source0:    %{name}-%{version}.tar.bz2
-Source1:    b64_ntop.c
 Patch0:     nc-1.107-linux-ify.patch
 Patch1:     nc-1.107-pollhup.patch
 Patch2:     nc-1.107-udp-stop.patch
@@ -45,10 +45,9 @@ capabilities.
 %patch6 -p1 -b .libbsd
 %patch7 -p1 -b .initialize-range
 %patch8 -p1 -b .iptos-class
-cp -p %{SOURCE1} .
 
 %build
-gcc %{optflags} `pkg-config --cflags --libs libbsd` -o nc netcat.c atomicio.c socks.c b64_ntop.c
+gcc %{optflags} -lresolv `pkg-config --cflags --libs libbsd` -o nc netcat.c atomicio.c socks.c
 
 %install
 install -d %{buildroot}%{_bindir}
@@ -61,6 +60,10 @@ install -m644 -p nc.1 %{buildroot}%{_mandir}/man1
 %{_mandir}/man1/nc.1*
 
 %changelog
+* Tue May 22 2012 Petr Šabata <contyk at redhat.com> - 1.107.20120403-1
+- Use glibc implementation of b64_ntop()
+- Include the CVS checkout date in Version
+
 * Tue Apr 03 2012 Petr Šabata <contyk at redhat.com> - 1.107-1
 - 1.107 bump
 - Warn if accept fails implemented upstream, removing the patch
diff --git a/sources b/sources
index 7bc7f20..fd50a22 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-81f10b846fdc58aebc00d903919b2ac5  nc-1.107.tar.bz2
+81f10b846fdc58aebc00d903919b2ac5  nc-1.107.20120403.tar.bz2