Changeset 30240


Ignore:
Timestamp:
2012-02-05T16:55:08+01:00 (6 years ago)
Author:
jow
Message:

[packages_10.03.2] portsentry: merge r28964

Location:
branches/packages_10.03.2/net/portsentry
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/packages_10.03.2/net/portsentry/Makefile

    r26055 r30240  
    11# 
    2 # Copyright (C) 2007 OpenWrt.org 
     2# Copyright (C) 2007-2011 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1010PKG_NAME:=portsentry 
    1111PKG_VERSION:=1.2 
    12 PKG_RELEASE:=1 
     12PKG_RELEASE:=2 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-1.2.tar.gz 
     
    3333 
    3434MAKE_FLAGS += \ 
     35        CFLAGS="$(TARGET_CFLAGS) -DNODAEMON" \ 
    3536        linux \ 
    3637 
    3738define Package/portsentry/install        
     39        $(INSTALL_DIR) $(1)/usr/bin 
     40        $(INSTALL_BIN) $(PKG_BUILD_DIR)/portsentry $(1)/usr/bin/ 
     41        $(INSTALL_DIR) $(1)/etc 
     42        $(INSTALL_DATA) $(PKG_BUILD_DIR)/portsentry.conf $(1)/etc/ 
    3843        $(INSTALL_DIR) $(1)/etc/init.d 
    39         $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_NAME).conf $(1)/etc/ 
    40         $(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/ 
    41         $(INSTALL_DIR) $(1)/usr/bin 
    42         $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/bin/ 
     44        $(INSTALL_BIN) ./files/portsentry.init $(1)/etc/init.d/portsentry 
     45        $(SED) 's|^\(.*_FILE\)="/usr/local/psionic/\(portsentry/.*\)"|\1="/var/run/\2"|g' \ 
     46             $(1)/etc/portsentry.conf 
    4347endef 
    4448 
  • branches/packages_10.03.2/net/portsentry/files/portsentry.init

    r10103 r30240  
    11#!/bin/sh /etc/rc.common 
    2 # Copyright (C) 2007 OpenWrt.org 
     2# Copyright (C) 2007-2011 OpenWrt.org 
     3 
    34START=99 
    45 
     6SERVICE_DAEMONIZE=1 
     7SERVICE_WRITE_PID=1 
     8 
    59start() { 
    6         portsentry -atcp 
    7         portsentry -audp 
     10        mkdir -m 0755 -p /var/run/portsentry 
     11        SERVICE_PID_FILE="/var/run/portsentry-atcp.pid" \ 
     12        service_start /usr/bin/portsentry -atcp 
     13        SERVICE_PID_FILE="/var/run/portsentry-audp.pid" \ 
     14        service_start /usr/bin/portsentry -audp 
    815} 
    916 
    1017stop() { 
    11         killall -9 portsentry 
     18        SERVICE_PID_FILE="/var/run/portsentry-atcp.pid" \ 
     19        service_stop /usr/bin/portsentry 
     20        SERVICE_PID_FILE="/var/run/portsentry-audp.pid" \ 
     21        service_stop /usr/bin/portsentry 
    1222} 
    13  
Note: See TracChangeset for help on using the changeset viewer.