Changes - j0ke.net Open Build Service

Changes of Revision 48

[-] [+]	Changed	busybox.changes
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Aug 29 15:37:32 UTC 2014 - cs@linux-administrator.com + +- added release patch busybox-1.22.1-nc.patch + +------------------------------------------------------------------- Sun Feb 23 14:59:13 UTC 2014 - cs@linux-administrator.com - update to release 1.22.1
[-] [+]	Changed	busybox.spec ^
@@ -27,7 +27,7 @@ Patch201: %{name}-%{version}-ash.patch Patch202: %{name}-%{version}-date.patch Patch203: %{name}-%{version}-iplink.patch -##Patch204: %{name}-%{version}-pname4.patch +Patch204: %{name}-%{version}-nc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -54,7 +54,7 @@ %patch201 -p1 %patch202 -p1 %patch203 -p1 -##patch204 -p1 +%patch204 -p1 %build cp -avL %{S:2} .config
[-] [+]	Deleted	busybox-1.21.1-install.patch ^
@@ -1,13 +0,0 @@ ---- busybox-1.19.0/applets/install.sh.orig 2011-08-11 02:23:58.000000000 +0200 -+++ busybox-1.19.0/applets/install.sh 2011-08-19 22:29:20.824991244 +0200 -@@ -9,7 +9,7 @@ - exit 1 - fi - --h=`sort busybox.links \| uniq` -+h=`sort /usr/share/busybox/busybox.links \| uniq` - - linkopts="" - scriptwrapper="n" - -
[-] [+]	Deleted	busybox-1.21.1-udhcp-services.patch ^
@@ -1,24 +0,0 @@ ---- networking/udhcp/common.c.orig 2010-08-23 02:44:35.000000000 +0200 -+++ networking/udhcp/common.c 2010-09-29 12:15:08.514367497 +0200 -@@ -49,6 +49,10 @@ - { OPTION_STRING , 0x43 }, /* DHCP_BOOT_FILE / - //TODO: not a string, but a set of LASCII strings: - // { OPTION_STRING , 0x4D }, / DHCP_USER_CLASS / -+ { OPTION_IP \| OPTION_LIST , 0x45 }, / DHCP_SMTP_SERVER / -+ { OPTION_IP \| OPTION_LIST , 0x46 }, / DHCP_POP3_SERVER / -+ { OPTION_IP \| OPTION_LIST , 0x4a }, / DHCP_IRC_SERVER / -+ { OPTION_IP \| OPTION_LIST , 0x48 }, / DHCP_WWW_SERVER / - #if ENABLE_FEATURE_UDHCP_RFC3397 - { OPTION_DNS_STRING \| OPTION_LIST , 0x77 }, / DHCP_DOMAIN_SEARCH / - { OPTION_SIP_SERVERS , 0x78 }, / DHCP_SIP_SERVERS / -@@ -105,6 +109,10 @@ - "tftp" "\0" / DHCP_TFTP_SERVER_NAME / - "bootfile" "\0" / DHCP_BOOT_FILE / - // "userclass" "\0" / DHCP_USER_CLASS / -+ "smtpsrv" "\0" / DHCP_SMTP_SERVER / -+ "pop3srv" "\0" / DHCP_POP3_SERVER / -+ "ircsrv" "\0" / DHCP_IRC_SERVER / -+ "wwwsrv" "\0" / DHCP_WWW_SERVER / - #if ENABLE_FEATURE_UDHCP_RFC3397 - "search" "\0" / DHCP_DOMAIN_SEARCH */ - // doesn't work in udhcpd.conf since OPTION_SIP_SERVERS
[-] [+]	Added	busybox-1.22.1-nc.patch ^
@@ -0,0 +1,15 @@ +--- busybox-1.22.1/networking/nc_bloaty.c ++++ busybox-1.22.1-nc/networking/nc_bloaty.c +@@ -175,9 +175,9 @@ enum { + OPT_w = (1 << 5), + OPT_l = (1 << 6) * ENABLE_NC_SERVER, + OPT_k = (1 << 7) * ENABLE_NC_SERVER, +- OPT_i = (1 << (7+2ENABLE_NC_SERVER)) ENABLE_NC_EXTRA, +- OPT_o = (1 << (8+2ENABLE_NC_SERVER)) ENABLE_NC_EXTRA, +- OPT_z = (1 << (9+2ENABLE_NC_SERVER)) ENABLE_NC_EXTRA, ++ OPT_i = (1 << (6+2ENABLE_NC_SERVER)) ENABLE_NC_EXTRA, ++ OPT_o = (1 << (7+2ENABLE_NC_SERVER)) ENABLE_NC_EXTRA, ++ OPT_z = (1 << (8+2ENABLE_NC_SERVER)) ENABLE_NC_EXTRA, + }; + + #define o_nflag (option_mask32 & OPT_n)
	Deleted	busybox-1.21.1.tar.bz2 ^