Update of /cvsroot/leaf/src/bering-uclibc/contrib/upnpd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2809
Modified Files:
buildtool.cfg buildtool.mk
Log Message:
workaround for shorewall specific files not interacting with the shorewall
package
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/contrib/upnpd/buildtool.cfg,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** buildtool.cfg 7 Apr 2005 18:09:37 -0000 1.2
--- buildtool.cfg 2 May 2005 18:33:40 -0000 1.3
***************
*** 194,208 ****
<File>
Filename = etc/shorewall/action.allowinUPnP
! Source = etc/shorewall/action.allowinUPnP
Type = binary
</File>
<File>
Filename = etc/shorewall/action.allowoutUPnP
! Source = etc/shorewall/action.allowoutUPnP
Type = binary
</File>
<File>
Filename = etc/shorewall/action.forwardUPnP
! Source = etc/shorewall/action.forwardUPnP
Type = binary
</File>
--- 194,208 ----
<File>
Filename = etc/shorewall/action.allowinUPnP
! Source =
etc/upnpd/shorewall/action.allowinUPnP
Type = binary
</File>
<File>
Filename = etc/shorewall/action.allowoutUPnP
! Source =
etc/upnpd/shorewall/action.allowoutUPnP
Type = binary
</File>
<File>
Filename = etc/shorewall/action.forwardUPnP
! Source =
etc/upnpd/shorewall/action.forwardUPnP
Type = binary
</File>
Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/contrib/upnpd/buildtool.mk,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** buildtool.mk 6 Apr 2005 15:59:45 -0000 1.1
--- buildtool.mk 2 May 2005 18:33:40 -0000 1.2
***************
*** 59,68 ****
install -d $(TARGET_DIR)/etc/default
install -d $(TARGET_DIR)/etc/init.d
! install -d $(TARGET_DIR)/etc/shorewall
cp upnpd-default $(TARGET_DIR)/etc/default/upnpd
cp upnpd-init $(TARGET_DIR)/etc/init.d/upnpd
! cp action.forwardUPnP $(TARGET_DIR)/etc/shorewall
! cp action.allowinUPnP $(TARGET_DIR)/etc/shorewall
! cp action.allowoutUPnP $(TARGET_DIR)/etc/shorewall
touch .build
--- 59,70 ----
install -d $(TARGET_DIR)/etc/default
install -d $(TARGET_DIR)/etc/init.d
! #temporary copy the shorewall action files to /etc/upnpd/shorewall
! #to not interact with the shorewall package
! install -d $(TARGET_DIR)/etc/upnpd/shorewall
cp upnpd-default $(TARGET_DIR)/etc/default/upnpd
cp upnpd-init $(TARGET_DIR)/etc/init.d/upnpd
! cp action.forwardUPnP $(TARGET_DIR)/etc/upnpd/shorewall
! cp action.allowinUPnP $(TARGET_DIR)/etc/upnpd/shorewall
! cp action.allowoutUPnP $(TARGET_DIR)/etc/upnpd/shorewall
touch .build
***************
*** 86,92 ****
rm -f $(BT_STAGING_DIR)/etc/init.d/upnpd
rm -f $(BT_STAGING_DIR)/etc/default/upnpd
! rm -f $(BT_STAGING_DIR)/etc/shorewall/forwardUPnP
! rm -f $(BT_STAGING_DIR)/etc/shorewall/allowinUPnP
! rm -f $(BT_STAGING_DIR)/etc/shorewall/allowoutUPnP
rm -f $(BT_STAGING_DIR)/etc/shorewall/start.d/upnpd_start
rm -f $(BT_STAGING_DIR)/usr/sbin/upnpd
--- 88,94 ----
rm -f $(BT_STAGING_DIR)/etc/init.d/upnpd
rm -f $(BT_STAGING_DIR)/etc/default/upnpd
! rm -f $(BT_STAGING_DIR)/etc/upnpd/shorewall/forwardUPnP
! rm -f $(BT_STAGING_DIR)/etc/upnpd/shorewall/allowinUPnP
! rm -f $(BT_STAGING_DIR)/etc/upnpd/shorewall/allowoutUPnP
rm -f $(BT_STAGING_DIR)/etc/shorewall/start.d/upnpd_start
rm -f $(BT_STAGING_DIR)/usr/sbin/upnpd
-------------------------------------------------------
This SF.Net email is sponsored by: NEC IT Guy Games.
Get your fingers limbered up and give it your best shot. 4 great events, 4
opportunities to win big! Highest score wins.NEC IT Guy Games. Play to
win an NEC 61 plasma display. Visit http://www.necitguy.com/?r=20
_______________________________________________
leaf-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
