Clean up sed scripts. Use /run not /var/run in init script. Clean up patches.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

8 files changed, 119 insertions, 65 deletions

diff --git a/net-analyzer/ippl/ChangeLog b/net-analyzer/ippl/ChangeLog
index a400a6c908b7..9b11e556f264 100644
--- a/net-analyzer/ippl/ChangeLog
+++ b/net-analyzer/ippl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/ippl
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ippl/ChangeLog,v 1.25 2013/02/24 14:09:39 pinkbyte Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ippl/ChangeLog,v 1.26 2014/07/12 18:04:05 jer Exp $
+
+*ippl-1.4.14-r4 (12 Jul 2014)
+
+  12 Jul 2014; Jeroen Roovers <jer@gentoo.org> +ippl-1.4.14-r4.ebuild,
+  files/ippl-1.4.14-includes.patch, files/ippl-1.4.14-manpage.patch,
+  files/ippl-1.4.14-noportresolve.patch,
+  files/ippl-1.4.14-privilege-drop.patch, files/ippl.rc:
+  Clean up sed scripts. Use /run not /var/run in init script. Clean up patches.
 
   24 Feb 2013; Sergey Popov <pinkbyte@gentoo.org> -ippl-1.4.14-r1.ebuild:
   Drop old revision
diff --git a/net-analyzer/ippl/Manifest b/net-analyzer/ippl/Manifest
index ed44131e5812..d5d62141afda 100644
--- a/net-analyzer/ippl/Manifest
+++ b/net-analyzer/ippl/Manifest
@@ -1,23 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX ippl-1.4.14-includes.patch 518 SHA256 fc5f442e224adb4d889dc55bb4e88b90b0491495be407056e4e5536c2c488a2c SHA512 3b477e3603c300136a1023440b252dad7eb4b1975a5281c4d76464c256fe598ac8a3984bbef21f6b2f3233fcb0b812cf4fb31e12cdf85f8d27ae39c6f56ce3af WHIRLPOOL 0788a1b9cace5a572afeb0dc011b7e7c1b215bbc99679920d12e8e72dd4bef6cf70b4bbfd3a21efae19241c2325e83f8c5a94e727ebca2a524cc4c326d2670d5
-AUX ippl-1.4.14-manpage.patch 378 SHA256 b084b1a1896b6c7315f595c727f743f1bd77f65a211dbd993abe26abae39ead6 SHA512 2d4f8a7b1ea6d58e02ac6bcbd5c49e31674cfcf48ff32e193b1f5ce469dda62f380e060ecee3f059248d7c39ac525180daee8ba5e2722edd475dc8d43fb9fdd7 WHIRLPOOL 69b41ac6469975445c2e9e44b76dd3f85d3308b2ea3d3861236c33e2ab1abd7a2d400ccbbca3cc920cae6d024002199ac08cffd161947f0cae09d0f21ed68572
-AUX ippl-1.4.14-noportresolve.patch 11186 SHA256 723c6eb52793d38b162d459236c1f78127b02000166f0fd1e2d28d709b000e3a SHA512 1a1bc152270f5d87a8907cb3659c9a2c84064f06709fc93e286f65e89ca8e0fce758759de557d5ad9253586d385384c4d4eb7c1c66dd853b25d856a88d8e7515 WHIRLPOOL 61a0822164b81285dde36b1636715c6961405bd943c61cb0c8b6cc4f89a70013c5b266b77ef2d69f45406d5f9b86127c21ba625317d30c88086098db84fad8b9
-AUX ippl-1.4.14-privilege-drop.patch 4613 SHA256 2fd4f19568bb2c4724c14c164de87ceb345a49bd365b49ea7f5e2d6183a6698e SHA512 b47968343e931e59a36e3f68d3b44a8e3280e8f3fda070e658bbf5b2cbdb821e8bc2525d7c64dda2cb57ca14b02a70505d082ffcc77099321e112014eb209c32 WHIRLPOOL 61472e4019ef2c62cc0f019df758e6a722615d874c0c91cdb901cbdbb2fbee6f1a525cdd4dfa54f0b9a3c7fe7a4534072a7ff4a67181352daf2be35807938b57
-AUX ippl.rc 779 SHA256 72cd981edd5b3d578e2e4b0299b4cc0610d24aacef3436c1d5fb611a8cd773e9 SHA512 2aacc6a778b6292c5f13bc1802016acaa2934c4ae79a9329922a68f9fbd98b503fa2bd5b15e9eb71061d8d35795f907a905dd523ed635878696feec87bb98510 WHIRLPOOL b611dad3b31efec16c23ae603197e5329e6c725f0d6cfdd3e2f49b947bdfd76e61edcf341ec2d5a70d4d0fd9e94b22073b0012d329fa120b7b20bb1b3443b289
+AUX ippl-1.4.14-includes.patch 374 SHA256 bffdfaa881cd176d2f6900bf387613485a9fba7b35aee68f8614a26272d7f4ea SHA512 5e7c8ab27770e3f50d09ee7e1f68246828d1b540a87c50c5c1afb3bbbe646af3b3d71369dfe2e41a1f04c306d88b8ef20f2be80edca8c201f7cb6d8c5539dfc9 WHIRLPOOL de8473f766992cec5e3e5a60380e519fa29a91ac79c2c530e5b7443cd117862e8ce81ff972855474a537702ff9dcc0a1a85df964edd97cbd8476d6b7a1698f3a
+AUX ippl-1.4.14-manpage.patch 306 SHA256 c1f1d47ce32c3133430312142e68e62c4aa243eed5afd8273ebe72e36ed04700 SHA512 4dc5b6ad12875c94a5b86ca380aeabb003734aabfd54b97edba20614b449dab35d8ba748e8faeda8a2bf2608158d4dd5c6e34c82b664ddf4fd12710ab81498ef WHIRLPOOL 67363710fc441665fa658b444961317d736214003df2ce0c383bc908afd4f34fdab4a690b797b8a8a5f66d813720557d63ecca3bbf998ad85c02fa2f64e5ca0e
+AUX ippl-1.4.14-noportresolve.patch 10610 SHA256 469f4c308379450c44399fb973c3963a1aa0dafe7dd95d1302a3a992843065ca SHA512 591a0aaaac11f80087e2f7a53a18434c065a2d29ba6a09893f2927edbd9b0622925e5bc441657f283fe4689c21bb669bfdfd71faf900d8ff9309e25885adc7e3 WHIRLPOOL a83593cfe2d126e2293b509510697955826d60560e4677be040d6b357c8f09c95e542a5c50c6c3f13202c5ba05dcd8dbf90ac9c78ff65747c9a2d58f323ff8ce
+AUX ippl-1.4.14-privilege-drop.patch 4289 SHA256 ab6839f5d9c5c74be5a8fa2cf03a236e4bc7b7096c4a5432b52ad78d39334020 SHA512 7b711bd0ac56867a6936035f63b047c1e86fe072f215dcc18eb8dada58d1087964a29b05c1eadef0303d203329a91a053e747c997d78ecd1697788e9f7a15f2f WHIRLPOOL 93cf090cb7e1db232d9979ee570e0b79c071901d8ccf78b8d1773fbec0737b34092d7fed9c279933fe3c013c323d23d0ea0da7ddcc79b0b1f55a560f83eb7fd6
+AUX ippl.rc 675 SHA256 67fa1c9b983e6a22b8e7be4cfd08f50111b103320ce5c100d737faf3a9c4be20 SHA512 98e9b3c565fc7e40d9b95dcca4c257cbcd44c00a6de2086356c58fcccb056aa4de8029514ec8a9a39ed911dfad559f7cbfda4bc1f4f206d166c679e254b0d011 WHIRLPOOL 7eb0e2adb7d70bfb2b82b9c06e4f999daebd84bfb37c1c0416bd24d9207833c9be12c3f7e6b398f3f4fc0ad76ad4fd903b6a6a7144b6a11739a9ffb84cadbf88
 DIST ippl-1.4.14.tar.gz 54030 SHA256 e1808c65e498036de2529d053dbaa95ba3f6821e2c7196d4dcbb5039489cfeb4 SHA512 3d71afc3ec7a0420cc9b269bf67dc008a777464c68d233dfbad4ee7a2dd2b960e114500e42866977e31b9dbeee26bbefea937fef8a09aa41cf87f96361ba0088 WHIRLPOOL aeab98a00d31583f19d4c98839f8eef4adbb263e274df2cd4065910e8a05d19e432be235de378e4039abc8465ff4fe8c11fcae1e95aa4e5dd34565acd4169c2a
 EBUILD ippl-1.4.14-r3.ebuild 1275 SHA256 8be9fc0755e36ee37a8bf6dc32abe52a883c60fac39cd70e2577d3f4efe68f8e SHA512 37ca60f82923f605197ec7b3ae0e396d9e93d86c5f7576342e4f681fdfa8d068d3b59d2a7a5f412b830559bef065c99f88bee76dcb0b49ad7f0bc2805067ab4d WHIRLPOOL dd8b03860126a3d8e47fe51a3f17b4e2167a467d4106144222caeb076ae0b9786233ccff1810add87afa7049419772713ad4acdfa44df7d7ff8d5dae4cd5025a
-MISC ChangeLog 3190 SHA256 487f2aee7dcf353f004cbad4f1cfc210f75134dbb376977e0465488d963a6885 SHA512 d824a99428a3aee80c75b2a24df53e91f8adb8f67e266988d2046ac6fbac1ba472c506a653bb02ff803b691ed1be9c80dc59525e724ac922962b0d9308789943 WHIRLPOOL fa502e82b25dea5ecfdffa6b25a691c06cf85a8d4a5f037da524cbb8028cbd708d506d06639dfdf3ad9ff8dd9433aba0639abfe5c267f660e5efd44fb701f810
+EBUILD ippl-1.4.14-r4.ebuild 1200 SHA256 f6b081cfd8cd2bd4fc0573896c99755fb76835bc6560e9f6d595233a05b683b5 SHA512 f15fb5067516f2e79800d98404789d82f2426df6edcede7d7ddb2af62aef27f609bb90b0fad116966ca999c823b36b4e4d7bc1d22eee92cb989b38922492011e WHIRLPOOL 09729d599ff4587371a8596cf9b1c5894422e8808af34f408b2d3e6f1c44ab28eec0421e12a25293cc86834080576cb76e90c20eb2cd91daca23e048a691d449
+MISC ChangeLog 3535 SHA256 8be0df5ee3b7add3f84b27c00a016e0e777e0d6cfa73615335607993fafb46f1 SHA512 54347cdb07822565e877d2b6131eafe505736634c8853d7bed714dce28d3915036b3d89fe7a8b9b49fc986578f880a4873c938793031208ab64c953469cc48ae WHIRLPOOL f4acced5f02871cfa5bd3d24171ee86babbfa4a4cbebfc7cc4e460515af83a0d6832b59f22ab2a64e29ab28c45e89ca4f9c0f212d27bd14bf12aaee4fa52008f
 MISC metadata.xml 235 SHA256 458c4936eaf4670e922eca2a6c8d114e634f80273d16cb3f30da158587c466a9 SHA512 87ec5ebb8775e5d9400af0c0ecd21393c1e523186714246b4605b003800019f9245b4d0ee43b12439a0dd4fc0a573443d4113aa3ec87a3a715dd9b0afe4112b8 WHIRLPOOL 6ca6e78a1cbcdde4606106f4177837bfa8cc386a6e12d59fab5ea4d707e9bf98849b2e8cd71d4ba5a8d9b9aa6858a466daac946b06cf21e407891be85fb23509
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJRKh8kAAoJECo/aRed9267f3UIAMI3sX7rviKEg2KVOn6vnsn2
-Inrml5ZCYtJ6CNY2+FZxQvR/4wFwFn9dcTztl5Fixuod2/B2l1zyOYfsV8AcMxn0
-taxaDcfZx7vmcYqlY1/VK6snFPmcGqCfOlcJB2kmWKrLpUjiVIkieLizVmMy9IuI
-teZxbx5t2jZGIaBebZJQm9Qexon7B21zIBXRnxtoWnOoWSiS0CywDPiK7Lqp4JGK
-SM9F8CNs2NxgJkIOGuVC6t0EFQ+axlxVOrwwCUPlcufQpvlC63aa7ZHd2ozIkbDW
-JbvyM1b1ohlTrrDHrrvA7Iuv12PCvuzwLTCqTxQbYjW+sAae5zteTlw6LXygYdg=
-=SOMF
+iEYEAREIAAYFAlPBeJcACgkQVWmRsqeSphM3WwCeMl1NmJ/jCGA5s8+bbRAVcsTj
+L9EAmgPCvxG7ubP2fxvCqcAD69411qVo
+=UeKD
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/ippl/files/ippl-1.4.14-includes.patch b/net-analyzer/ippl/files/ippl-1.4.14-includes.patch
index d1883ee0883a..12b2832fa342 100644
--- a/net-analyzer/ippl/files/ippl-1.4.14-includes.patch
+++ b/net-analyzer/ippl/files/ippl-1.4.14-includes.patch
@@ -1,5 +1,5 @@
---- a/Source/filter.c	2010-09-15 02:17:55.000000000 +0200
-+++ b/Source/filter.c	2010-09-15 02:23:46.000000000 +0200
+--- a/Source/filter.c
++++ b/Source/filter.c
 @@ -22,6 +22,7 @@
  
  #include <stdlib.h>
@@ -8,8 +8,8 @@
  
  #include <fnmatch.h>
  
---- a/Source/main.c	2010-09-15 02:17:56.000000000 +0200
-+++ b/Source/main.c	2010-09-15 02:24:00.000000000 +0200
+--- a/Source/main.c
++++ b/Source/main.c
 @@ -37,6 +37,7 @@
  #include <pwd.h>
  #include <stdlib.h>
diff --git a/net-analyzer/ippl/files/ippl-1.4.14-manpage.patch b/net-analyzer/ippl/files/ippl-1.4.14-manpage.patch
index c20b60f1a56f..d17e5939cdee 100644
--- a/net-analyzer/ippl/files/ippl-1.4.14-manpage.patch
+++ b/net-analyzer/ippl/files/ippl-1.4.14-manpage.patch
@@ -1,7 +1,7 @@
 patch by Marc Haber <mh+debian-packages@zugschlus.de>
 
---- a/Docs/ippl.conf.man	2000-11-05 22:03:47.000000000 +0000
-+++ b/Docs/ippl.conf.man	2005-03-19 20:53:38.340875122 +0000
+--- a/Docs/ippl.conf.man
++++ b/Docs/ippl.conf.man
 @@ -222,9 +222,7 @@
  .SS Protocol
  .PP
diff --git a/net-analyzer/ippl/files/ippl-1.4.14-noportresolve.patch b/net-analyzer/ippl/files/ippl-1.4.14-noportresolve.patch
index 80cda4274ccb..919623040f7f 100644
--- a/net-analyzer/ippl/files/ippl-1.4.14-noportresolve.patch
+++ b/net-analyzer/ippl/files/ippl-1.4.14-noportresolve.patch
@@ -1,7 +1,7 @@
 patch by Marc Haber <mh+debian-packages@zugschlus.de>
 
---- Docs/ippl.conf.man	2008-06-05 12:39:24 +0000
-+++ Docs/ippl.conf.man	2008-06-05 12:46:02 +0000
+--- a/Docs/ippl.conf.man
++++ b/Docs/ippl.conf.man
 @@ -92,6 +92,13 @@
  .PP
  By default, IP address resolution is disabled for all the protocols.
@@ -30,8 +30,8 @@ patch by Marc Haber <mh+debian-packages@zugschlus.de>
  use ident logging (only for TCP).
  .PP
 
---- Source/configuration.c	2008-06-05 12:39:24 +0000
-+++ Source/configuration.c	2008-06-05 12:46:02 +0000
+--- a/Source/configuration.c
++++ b/Source/configuration.c
 @@ -60,6 +60,7 @@
    extern unsigned int dns_expire;
    extern unsigned short log_protocols;
@@ -49,8 +49,8 @@ patch by Marc Haber <mh+debian-packages@zugschlus.de>
    tcp_format = LOGFORMAT_NORMAL;
    udp_format = LOGFORMAT_NORMAL;
 
---- Source/filter.c	2008-06-05 12:39:24 +0000
-+++ Source/filter.c	2008-06-05 12:46:02 +0000
+--- a/Source/filter.c
++++ b/Source/filter.c
 @@ -46,6 +46,7 @@
  
  extern unsigned short use_ident;
@@ -114,8 +114,8 @@ patch by Marc Haber <mh+debian-packages@zugschlus.de>
  
  #ifdef FILTER_DEBUG
 
---- Source/filter.h	2008-06-05 12:39:24 +0000
-+++ Source/filter.h	2008-06-05 12:46:02 +0000
+--- a/Source/filter.h
++++ b/Source/filter.h
 @@ -53,6 +53,7 @@
  struct filter_entry {
    short log;		/* TRUE for "log", FALSE for "ignore" */
@@ -133,8 +133,8 @@ patch by Marc Haber <mh+debian-packages@zugschlus.de>
    short logformat;
  };
 
---- Source/ippl.l	2008-06-05 12:39:24 +0000
-+++ Source/ippl.l	2008-06-05 12:46:02 +0000
+--- a/Source/ippl.l
++++ b/Source/ippl.l
 @@ -75,6 +75,9 @@
  [lL][oO][gG][cC][lL][oO][sS][iI][nN][gG] return LOGCLOSING;
  [nN][oO][lL][oO][gG][cC][lL][oO][sS][iI][nN][gG] return NOLOGCLOSING;
@@ -146,8 +146,8 @@ patch by Marc Haber <mh+debian-packages@zugschlus.de>
  [rR][eE][sS][oO][lL][vV][eE] return RESOLVE;
  
 
---- Source/ippl.y	2008-06-05 12:39:24 +0000
-+++ Source/ippl.y	2008-06-05 12:46:02 +0000
+--- a/Source/ippl.y
++++ b/Source/ippl.y
 @@ -61,6 +61,7 @@
  
  /* Should name resolving be done? */
@@ -203,8 +203,8 @@ patch by Marc Haber <mh+debian-packages@zugschlus.de>
          | NORMAL     { switches.logformat = LOGFORMAT_NORMAL; }
          | DETAILED   { switches.logformat = LOGFORMAT_DETAILED; }
 
---- Source/main.c	2008-06-05 12:39:24 +0000
-+++ Source/main.c	2008-06-05 12:46:02 +0000
+--- a/Source/main.c
++++ b/Source/main.c
 @@ -48,6 +48,10 @@
  #include "filter.h"
  #include "pidfile.h"
@@ -217,8 +217,8 @@ patch by Marc Haber <mh+debian-packages@zugschlus.de>
  struct loginfo log;
  
 
---- Source/netutils.c	2008-06-05 12:39:24 +0000
-+++ Source/netutils.c	2008-06-05 12:46:02 +0000
+--- a/Source/netutils.c
++++ b/Source/netutils.c
 @@ -237,15 +237,21 @@
   * Get a service name for a specified protocol
   */
@@ -247,8 +247,8 @@ patch by Marc Haber <mh+debian-packages@zugschlus.de>
    pthread_mutex_unlock(&service_mutex);
  }
 
---- Source/netutils.h	2008-06-05 12:39:24 +0000
-+++ Source/netutils.h	2008-06-05 12:46:02 +0000
+--- a/Source/netutils.h
++++ b/Source/netutils.h
 @@ -53,6 +53,6 @@
                   const __u32 src_addr, const __u16 src_port,
                   const __u32 dst_addr, const __u16 dst_port);
@@ -258,8 +258,8 @@ patch by Marc Haber <mh+debian-packages@zugschlus.de>
  
  #endif
 
---- Source/tcp.c	2008-06-05 12:39:24 +0000
-+++ Source/tcp.c	2008-06-05 12:46:02 +0000
+--- a/Source/tcp.c
++++ b/Source/tcp.c
 @@ -51,6 +51,7 @@
  struct loginfo tcp_log;
  extern struct loginfo log;
@@ -287,8 +287,8 @@ patch by Marc Haber <mh+debian-packages@zugschlus.de>
        get_details(details,
                    IPHDR.saddr,
 
---- Source/udp.c	2008-06-05 12:39:24 +0000
-+++ Source/udp.c	2008-06-05 12:46:02 +0000
+--- a/Source/udp.c
++++ b/Source/udp.c
 @@ -81,7 +81,7 @@
      *details ='\0';
      host_print(remote_host, IPHDR.saddr,
@@ -299,8 +299,8 @@ patch by Marc Haber <mh+debian-packages@zugschlus.de>
        get_details(details,
                    IPHDR.saddr,
 
---- ippl.conf	2008-06-05 12:39:24 +0000
-+++ ippl.conf	2008-06-05 12:48:36 +0000
+--- a/ippl.conf
++++ b/ippl.conf
 @@ -4,13 +4,15 @@
  # User used
  # ---------
diff --git a/net-analyzer/ippl/files/ippl-1.4.14-privilege-drop.patch b/net-analyzer/ippl/files/ippl-1.4.14-privilege-drop.patch
index 7a397a86c054..0f6d03684a93 100644
--- a/net-analyzer/ippl/files/ippl-1.4.14-privilege-drop.patch
+++ b/net-analyzer/ippl/files/ippl-1.4.14-privilege-drop.patch
@@ -1,7 +1,7 @@
 privilege-drop by Marc Haber <mh+debian-packages@zugschlus.de>
 
---- trunk~/Source/icmp.c	2001-09-28 20:47:58.000000000 +0200
-+++ trunk/Source/icmp.c	2007-05-20 12:05:24.000000000 +0200
+--- a/Source/icmp.c
++++ b/Source/icmp.c
 @@ -39,6 +39,8 @@
  #include "log.h"
  #include "filter.h"
@@ -31,8 +31,8 @@ privilege-drop by Marc Haber <mh+debian-packages@zugschlus.de>
  
    for(;;) {
      if (read(icmp_socket, (__u8 *) &pkt, ICMP_CAPTURE_LENGTH) == -1) {
---- trunk~/Source/main.c	2000-04-21 21:37:49.000000000 +0200
-+++ trunk/Source/main.c	2007-05-20 12:05:24.000000000 +0200
+--- a/Source/main.c
++++ b/Source/main.c
 @@ -153,6 +153,17 @@
      run_thread(&udp_t, log_udp, (void *)account);
    }
@@ -76,8 +76,8 @@ privilege-drop by Marc Haber <mh+debian-packages@zugschlus.de>
    signal(SIGHUP, sighup);
  }
  
---- trunk~/Source/tcp.c	2001-09-29 15:27:01.000000000 +0200
-+++ trunk/Source/tcp.c	2007-05-20 12:05:24.000000000 +0200
+--- a/Source/tcp.c
++++ b/Source/tcp.c
 @@ -44,6 +44,8 @@
  #include "filter.h"
  #include "configuration.h"
@@ -107,8 +107,8 @@ privilege-drop by Marc Haber <mh+debian-packages@zugschlus.de>
  
    for(;;) {
      if (read(tcp_socket, (__u8 *) &pkt, TCP_CAPTURE_LENGTH) == -1) {
---- trunk~/Source/udp.c	2001-09-28 20:47:35.000000000 +0200
-+++ trunk/Source/udp.c	2007-05-20 12:05:24.000000000 +0200
+--- a/Source/udp.c
++++ b/Source/udp.c
 @@ -39,6 +39,8 @@
  #include "filter.h"
  #include "configuration.h"
diff --git a/net-analyzer/ippl/files/ippl.rc b/net-analyzer/ippl/files/ippl.rc
index fe68372d6298..9a30c4686423 100644
--- a/net-analyzer/ippl/files/ippl.rc
+++ b/net-analyzer/ippl/files/ippl.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ippl/files/ippl.rc,v 1.5 2005/04/02 13:17:01 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ippl/files/ippl.rc,v 1.6 2014/07/12 18:04:05 jer Exp $
 
 depend() {
 	need net
@@ -19,19 +19,13 @@ checkconfig() {
 start() {
 	checkconfig || return $?
 	ebegin "Starting ippl"
-	start-stop-daemon --start --quiet --pidfile /var/run/ippl.pid \
-		--startas /usr/sbin/ippl
+	start-stop-daemon --start --quiet --pidfile /run/ippl.pid \
+		--exec /usr/sbin/ippl
 	eend $? "Failed to start ippl"
 }
 
 stop() {
 	ebegin "Stopping ippl"
-	start-stop-daemon --stop --quiet --pidfile /var/run/ippl.pid
+	start-stop-daemon --stop --quiet --pidfile /run/ippl.pid
 	eend $? "Failed to stop ippl"
-
-	# clean stale pidfile
-	if [ -f /var/run/ippl.pid ]
-	then
-		rm -f /var/run/ippl.pid
-	fi
 }
diff --git a/net-analyzer/ippl/ippl-1.4.14-r4.ebuild b/net-analyzer/ippl/ippl-1.4.14-r4.ebuild
new file mode 100644
index 000000000000..97aa0fa08117
--- /dev/null
+++ b/net-analyzer/ippl/ippl-1.4.14-r4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ippl/ippl-1.4.14-r4.ebuild,v 1.1 2014/07/12 18:04:05 jer Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs user
+
+DESCRIPTION="A daemon which logs TCP/UDP/ICMP packets"
+HOMEPAGE="http://pltplp.net/ippl/"
+SRC_URI="http://pltplp.net/ippl/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="virtual/yacc
+	>=sys-devel/flex-2.5.4a-r4"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/ippl-1.4.14-noportresolve.patch \
+		"${FILESDIR}"/ippl-1.4.14-manpage.patch \
+		"${FILESDIR}"/ippl-1.4.14-privilege-drop.patch \
+		"${FILESDIR}"/ippl-1.4.14-includes.patch
+	sed -i Source/Makefile.in \
+		-e 's|^LDFLAGS=|&@LDFLAGS@|g' \
+		|| die
+	sed -i Makefile.in \
+		-e 's|make |$(MAKE) |g' \
+		|| die
+	# fix for bug #351287
+	sed -i -e '/lex.yy.c/s/ippl.l/& y.tab.c/' Source/Makefile.in \
+		|| die
+
+	tc-export CC
+}
+
+src_install() {
+	dosbin Source/ippl
+
+	insinto "/etc"
+	doins ippl.conf
+
+	doman Docs/{ippl.8,ippl.conf.5}
+
+	dodoc BUGS CREDITS HISTORY README TODO
+
+	newinitd "${FILESDIR}"/ippl.rc ippl
+}
+
+pkg_postinst() {
+	enewuser ippl
+}