From d24377ebd1e0558d648a906d5d04f5507f4ec36b Mon Sep 17 00:00:00 2001
From: Thomas Ries <tries@gmx.net>
Date: Fri, 31 Oct 2003 20:42:03 +0000
Subject: [PATCH] - install to sbin - adapted SPEC file

---
 ChangeLog       |  1 +
 RELNOTES        | 22 +++++++---------------
 siproxd.spec.in | 12 ++++++++----
 src/Makefile.am |  2 +-
 4 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index abdd0f4..2c54b71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 0.4.2
 =====
   31-Oct-2003:	- released 0.4.2
+		- Makefile: install siproxd to sbin (was bin)
   24-Oct-2003:	- SPEC file: included config files & more docu
   19-Oct-2003:	- included compiling support for DMALLOC debugging
 		- fixed 2 memory leaks in proxy.c
diff --git a/RELNOTES b/RELNOTES
index ebfabf0..5073f34 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,7 +1,7 @@
-Release Notes for siproxd-0.4.1
+Release Notes for siproxd-0.4.2
 ===============================
 
- - May be used as an pure Outbound proxy (registration of local UAs
+ - May be used as pure Outbound proxy (registration of local UAs
    to a 3rd party registrar)
  - Fli4l OPT_SIP (still experimental) available, check
    http://home.arcor.de/jsffm/fli4l/
@@ -17,17 +17,16 @@ Release Notes for siproxd-0.4.1
  - RTP proxy can handle multiple RTP streams (eg. audio + video)
    within a single SIP session.
  - Multiple local users/hosts can be masqueraded simultaneously
- - Supports running in a chroot jail (configurable)
- - Supports changing user-ID after startup (if started as root)
+ - Supports running in a chroot jail and changing user-ID after startup
  - All configuration done via one simple ascii configuration file
  - Proxy Authentication for registration of local clients (User Agents)
    with individual passwords for each user
  - Logging to syslog in daemon mode
  - Access control (IP based) for incoming traffic
- - RPM support
+ - RPM package available
  - works with "dial-up" conenctions (dynamic IP addresses)
  - The host part of UA registration entries can be masqueraded
-   (mask_host, masked_host config items) Siemens SIP phones seem to
+   (mask_host, masked_host config items). Some Siemens SIP phones seem to
    need this 'feature'.
 
 Requirements:
@@ -62,16 +61,9 @@ Known bugs:
 
 
 -----
-md5sum for siproxd-0.4.1.tar.gz: 	af7d0e56eefabfbd24c5338460cd6f95
+md5sum for siproxd-0.4.2.tar.gz: 	
 
-GnuPG signature for siproxd-0.4.1.tar.gz archive:
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.1 (GNU/Linux)
-
-iD8DBQA/iSoPCfzBioe83JQRAhEcAKCmMxXgiPEce7g6vVYr//OWx7mZRACeM4h3
-Vh1INpiRnFUFA3BATgbG4fg=
-=fuMJ
------END PGP SIGNATURE-----
+GnuPG signature for siproxd-0.4.2.tar.gz archive:
 
 
 GnuPG: pub  1024D/87BCDC94 2000-03-19 Thomas Ries <tries@gmx.net>
diff --git a/siproxd.spec.in b/siproxd.spec.in
index c9e505c..c3fb458 100644
--- a/siproxd.spec.in
+++ b/siproxd.spec.in
@@ -45,7 +45,8 @@ make
 make prefix=$RPM_BUILD_ROOT%{prefix} \
      sysconfdir=$RPM_BUILD_ROOT%{sysconfdir} \
      install
-mv %{sysconfdir}/siproxd.conf.example %{sysconfdir}/siproxd.conf
+mv $RPM_BUILD_ROOT%{sysconfdir}/siproxd.conf.example \
+   $RPM_BUILD_ROOT%{sysconfdir}/siproxd.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -53,7 +54,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-, root, root)
 %doc COPYING README AUTHORS INSTALL NEWS ChangeLog doc/FAQ doc/FLI4L_HOWTO.txt
-%{_bindir}/siproxd
+%{_sbindir}/siproxd
 %config %{sysconfdir}/siproxd.conf
 %config %{sysconfdir}/siproxd_passwd.cfg
 
@@ -62,12 +63,15 @@ echo "Edit the config file %{sysconfigdir}/siproxd.conf!"
 
 
 %changelog
-* Sat Aug 30 2003 Thomas Ries <tries@gmx.net>
+* Fri Oct 31 2003 Thomas Ries <tries@gmx.net>
+- siproxd is now installed to sbin directory
+
+* Fri Oct 24 2003 Thomas Ries <tries@gmx.net>
 - added config files and some more doc files
 - rename sample config file and remind uder to edit it.
 - minor cleanup
 
-* Sat Oct 24 2003 Thomas Ries <tries@gmx.net>
+* Sat Aug 30 2003 Thomas Ries <tries@gmx.net>
 - always use /etc as sysconfdir
 
 * Sat Sep 21 2002 Thomas Ries <tries@gmx.net>
diff --git a/src/Makefile.am b/src/Makefile.am
index 3eb36c7..d48e97c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,7 @@
 
 CFLAGS =@CFLAGS@ -Wall -DBUILDSTR=\"`cat .buildno`\" -D_GNU_SOURCE
 
-bin_PROGRAMS = siproxd
+sbin_PROGRAMS = siproxd
 siproxd_SOURCES = siproxd.c proxy.c register.c sock.c utils.c \
 		  sip_utils.c log.c readconf.c rtpproxy.c \
                   rtpproxy_relay.c rtpproxy_masq.c accessctl.c \