OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Only display areas with differences – Ignore whitespace
Rev 2 Rev 3
1 # 1 #
2 # Copyright (C) 2011 OpenWrt.org 2 # Copyright (C) 2011 OpenWrt.org
3 # 3 #
4 # This is free software, licensed under the GNU General Public License v2. 4 # This is free software, licensed under the GNU General Public License v2.
5 # See /LICENSE for more information. 5 # See /LICENSE for more information.
6 # 6 #
7   7  
8 include $(TOPDIR)/rules.mk 8 include $(TOPDIR)/rules.mk
9   9  
10 PKG_NAME:=dante 10 PKG_NAME:=dante
11 PKG_VERSION:=1.4.1 11 PKG_VERSION:=1.4.1
12 PKG_RELEASE:=3 12 PKG_RELEASE:=1
13   13  
14 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 14 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
15 PKG_SOURCE_URL:=http://www.inet.no/dante/files/ 15 PKG_SOURCE_URL:=http://www.inet.no/dante/files/
16 PKG_HASH:=b6d232bd6fefc87d14bf97e447e4fcdeef4b28b16b048d804b50b48f261c4f53 16 PKG_HASH:=b6d232bd6fefc87d14bf97e447e4fcdeef4b28b16b048d804b50b48f261c4f53
17   17  
18 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io> 18 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
19 PKG_LICENSE:=BSD-4-Clause 19 PKG_LICENSE:=BSD-4-Clause
20   20  
21 PKG_FIXUP:=autoreconf 21 PKG_FIXUP:=autoreconf
22 PKG_INSTALL:=1 22 PKG_INSTALL:=1
23   23  
24 include $(INCLUDE_DIR)/package.mk 24 include $(INCLUDE_DIR)/package.mk
25   25  
26 CONFIGURE_ARGS += \ 26 CONFIGURE_ARGS += \
27 --without-upnp \ 27 --without-upnp \
28 --without-pam \ 28 --without-pam \
29 --disable-libwrap 29 --disable-libwrap
30   30  
31 CONFIGURE_VARS += \ 31 CONFIGURE_VARS += \
32 ac_cv_search_pam_start="" \ 32 ac_cv_search_pam_start=""
33 ac_cv_func_sched_setscheduler=no -  
34   33  
35 define Build/InstallDev 34 define Build/InstallDev
36 $(INSTALL_DIR) $(1)/usr/include 35 $(INSTALL_DIR) $(1)/usr/include
37 $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ 36 $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
38 $(INSTALL_DIR) $(1)/usr/lib 37 $(INSTALL_DIR) $(1)/usr/lib
39 $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{a,so*,la} $(1)/usr/lib/ 38 $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{a,so*,la} $(1)/usr/lib/
40 endef 39 endef
41   40  
42   41  
43 define Package/dante/default 42 define Package/dante/default
44 TITLE:=Dante SOCKS 43 TITLE:=Dante SOCKS
45 URL:=http://www.inet.no/dante/ 44 URL:=http://www.inet.no/dante/
46 endef 45 endef
47   46  
48 define Package/dante/default/description 47 define Package/dante/default/description
49 Dante is a circuit-level firewall/proxy that can be used to provide convenient 48 Dante is a circuit-level firewall/proxy that can be used to provide convenient
50 and secure network connectivity, requiring only that the server Dante runs on 49 and secure network connectivity, requiring only that the server Dante runs on
51 has external network connectivity. Dante is used daily by Fortune 100 companies 50 has external network connectivity. Dante is used daily by Fortune 100 companies
52 and large international organizations, either as a standard SOCKS server or as 51 and large international organizations, either as a standard SOCKS server or as
53 a "reverse proxy". 52 a "reverse proxy".
54 endef 53 endef
55   54  
56 define Package/libsocks 55 define Package/libsocks
57 $(call Package/dante/default) 56 $(call Package/dante/default)
58 SECTION:=libs 57 SECTION:=libs
59 CATEGORY:=Libraries 58 CATEGORY:=Libraries
60 TITLE+= Library 59 TITLE+= Library
61 ABI_VERSION:=0 -  
62 endef 60 endef
63   61  
64 define Package/libsocks/description 62 define Package/libsocks/description
65 $(call Package/dante/default/description) 63 $(call Package/dante/default/description)
66 This package provides the shared libsocks library. 64 This package provides the shared libsocks library.
67 endef 65 endef
68   66  
69 define Package/libsocks/install 67 define Package/libsocks/install
70 $(INSTALL_DIR) $(1)/usr/lib 68 $(INSTALL_DIR) $(1)/usr/lib
71 $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsocks.so.* $(1)/usr/lib/ 69 $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsocks.so* $(1)/usr/lib/
72 endef 70 endef
73   71  
74   72  
75 define Package/sockd 73 define Package/sockd
76 $(call Package/dante/default) 74 $(call Package/dante/default)
77 SUBMENU:=Web Servers/Proxies 75 SUBMENU:=Web Servers/Proxies
78 SECTION:=net 76 SECTION:=net
79 CATEGORY:=Network 77 CATEGORY:=Network
80 TITLE+= Daemon 78 TITLE+= Daemon
81 endef 79 endef
82   80  
83 define Package/sockd/description 81 define Package/sockd/description
84 $(call Package/dante/default/description) 82 $(call Package/dante/default/description)
85 This package provides the Dante sockd daemon. 83 This package provides the Dante sockd daemon.
86 endef 84 endef
87   85  
88 define Package/sockd/install 86 define Package/sockd/install
89 $(INSTALL_DIR) $(1)/usr/sbin 87 $(INSTALL_DIR) $(1)/usr/sbin
90 $(CP) $(PKG_INSTALL_DIR)/usr/sbin/sockd $(1)/usr/sbin/ 88 $(CP) $(PKG_INSTALL_DIR)/usr/sbin/sockd $(1)/usr/sbin/
91 endef 89 endef
92   90  
93   91  
94 define Package/socksify 92 define Package/socksify
95 $(call Package/dante/default) 93 $(call Package/dante/default)
96 SECTION:=net 94 SECTION:=net
97 CATEGORY:=Network 95 CATEGORY:=Network
98 SUBMENU:=Web Servers/Proxies 96 SUBMENU:=Web Servers/Proxies
99 TITLE+= Client 97 TITLE+= Client
100 endef 98 endef
101   99  
102 define Package/socksify/description 100 define Package/socksify/description
103 $(call Package/dante/default/description) 101 $(call Package/dante/default/description)
104 This package provides the Dante socksify client. 102 This package provides the Dante socksify client.
105 endef 103 endef
106   104  
107 define Package/socksify/install 105 define Package/socksify/install
108 $(INSTALL_DIR) $(1)/usr/bin 106 $(INSTALL_DIR) $(1)/usr/bin
109 $(CP) $(PKG_INSTALL_DIR)/usr/bin/socksify $(1)/usr/bin/ 107 $(CP) $(PKG_INSTALL_DIR)/usr/bin/socksify $(1)/usr/bin/
110   108  
111 $(INSTALL_DIR) $(1)/usr/lib 109 $(INSTALL_DIR) $(1)/usr/lib
112 $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdsocks.so* $(1)/usr/lib/ 110 $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdsocks.so* $(1)/usr/lib/
113 endef 111 endef
114   112  
115   113  
116 $(eval $(call BuildPackage,libsocks)) 114 $(eval $(call BuildPackage,libsocks))
117 $(eval $(call BuildPackage,sockd)) 115 $(eval $(call BuildPackage,sockd))
118 $(eval $(call BuildPackage,socksify)) 116 $(eval $(call BuildPackage,socksify))
119   117