[PATCH]

Noticed the rpmbuild wasn't working...  partly from version change (refuses to build with 1.3.4/1.4.0 missmatch), and it was also out of date for the with/enable switch on configure for bcrelay.  (Also noted in bug #44, and so this includes and expands on that fix).


Update also available via master branch git://git.code.sf.net/u/johnalauro/poptop   (may want to merge --squash if you use that).


diff --git a/bcrelay.c b/bcrelay.c
index c5a6c73..4f4836c 100644
--- a/bcrelay.c
+++ b/bcrelay.c
@@ -317,7 +317,7 @@ int main(int argc, char **argv) {
 #ifndef BCRELAY
   fprintf(stderr,
           "bcrelay: pptpd was compiled without support for bcrelay, exiting.\n"
-          "         run configure --with-bcrelay, make, and install.\n");
+          "         run configure --enable-bcrelay, make, and install.\n");
   exit(1);
 #endif
 
diff --git a/pptpd.spec b/pptpd.spec
index 1d829cb..6c6125e 100644
--- a/pptpd.spec
+++ b/pptpd.spec
@@ -56,8 +56,7 @@ echo '#define VERSION "%{ppp_version}"' >> plugins/patchlevel.h
        %{?_with_slirp:--with-slirp} \
        %{!?_with_ipalloc:--without-pppd-ip-alloc} \
        %{?_with_ipalloc:--with-pppd-ip-alloc} \
-       %{!?_without_bcrelay:--with-bcrelay} \
-       %{?_without_bcrelay:--without-bcrelay}
+       %{!?_without_bcrelay:--enable-bcrelay}
 %{__make} CFLAGS='-fno-builtin -fPIC -DSBINDIR=\"%{_sbindir}\" %{optflags}'
 
 %install
@@ -107,18 +106,24 @@ fi
 %{_sbindir}/pptpd
 %{_sbindir}/pptpctrl
 %{_sbindir}/pptp-portslave
-%{!?_without_bcrelay:%{_sbindir}/bcrelay}
+%{_sbindir}/bcrelay
 %{_libdir}/pptpd/pptpd-logwtmp.so
 %{_bindir}/vpnuser
 %{_bindir}/vpnstats.pl
 %{_mandir}/man5/pptpd.conf.5*
 %{_mandir}/man8/pptpd.8*
 %{_mandir}/man8/pptpctrl.8*
+%{_mandir}/man8/bcrelay.8*
 /etc/rc.d/init.d/pptpd
 %config(noreplace) /etc/pptpd.conf
 %config(noreplace) /etc/ppp/options.pptpd
 
 %changelog
+* Wed Oct 23 2013 John Lauro <[email protected]> - 1.4.0-1
+- Update to 1.4.0
+- Bring .spec and bcrelay in sync with configure option
+- Include man pages as expected files for bcrelay
+
 * Thu Aug 30 2012 Charlie Brady <[email protected]> 1.3.4-2
 - Update pptpd-logwtmp plugin version compatibility to match buildsys
   ppp version.




----- Original Message -----
> From: "James Cameron" <[email protected]>
> To: [email protected]
> Sent: Wednesday, October 23, 2013 3:10:44 AM
> Subject: [Poptop-server] pptpd-1.4.0 released
> 
> G'day,
> 
> pptpd 1.4.0 has been released.
> 
> Please reply to the mailing list with your test results.
> 
> See:
>         https://sourceforge.net/projects/poptop/files/pptpd/pptpd-1.4.0/
> 

Awesome!

------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from 
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60135991&iu=/4140/ostg.clktrk