Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2014-03-27 06:14:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linuxrc (Old) and /work/SRC/openSUSE:Factory/.linuxrc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "linuxrc" Changes: -------- --- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2014-03-23 22:29:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2014-03-27 06:14:50.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Mar 26 08:22:38 CET 2014 - snwint@suse.de + +- fix gcc aliasing warning +- ctc0 is now slccw0.0.???? +- don't do arping on ptp interfaces +- remove gobal net_is_ptp_im var and put ptp checks into a single function + +------------------------------------------------------------------- Old: ---- linuxrc-4.2.14.tar.bz2 New: ---- linuxrc-4.2.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.RQGSXj/_old 2014-03-27 06:14:51.000000000 +0100 +++ /var/tmp/diff_new_pack.RQGSXj/_new 2014-03-27 06:14:51.000000000 +0100 @@ -25,9 +25,9 @@ Summary: SUSE Installation Program License: GPL-3.0+ Group: System/Boot -Version: 4.2.14 +Version: 4.2.15 Release: 0 -Source: linuxrc-4.2.14.tar.bz2 +Source: linuxrc-4.2.15.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ linuxrc-4.2.14.tar.bz2 -> linuxrc-4.2.15.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.14/VERSION new/linuxrc-4.2.15/VERSION --- old/linuxrc-4.2.14/VERSION 2014-03-20 13:07:33.000000000 +0100 +++ new/linuxrc-4.2.15/VERSION 2014-03-26 08:22:33.000000000 +0100 @@ -1 +1 @@ -4.2.14 +4.2.15 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.14/auto2.c new/linuxrc-4.2.15/auto2.c --- old/linuxrc-4.2.14/auto2.c 2014-03-10 13:09:19.000000000 +0100 +++ new/linuxrc-4.2.15/auto2.c 2014-03-26 08:09:51.000000000 +0100 @@ -595,8 +595,6 @@ /* * Let user enter network config data. */ -extern int net_is_ptp_im; - void auto2_user_netconfig() { int win_old; @@ -604,14 +602,9 @@ if(!config.net.do_setup) return; - if (config.net.device) { - net_is_ptp_im = FALSE; - if(strstr(config.net.device, "plip") == config.net.device) net_is_ptp_im = TRUE; - if(strstr(config.net.device, "iucv") == config.net.device) net_is_ptp_im = TRUE; - if(strstr(config.net.device, "ctc") == config.net.device) net_is_ptp_im = TRUE; - } + check_ptp(); - if( ((net_config_mask() & 3) == 3) || (net_is_ptp_im && ((net_config_mask() & 1) == 1)) ) { + if( ((net_config_mask() & 3) == 3) || (config.net.ptp && ((net_config_mask() & 1) == 1)) ) { /* we have IP & netmask (or just IP for PTP devices) */ config.net.configured = nc_static; /* looks a bit weird, but we need it here for net_activate_ns() */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.14/changelog new/linuxrc-4.2.15/changelog --- old/linuxrc-4.2.14/changelog 2014-03-20 13:07:35.000000000 +0100 +++ new/linuxrc-4.2.15/changelog 2014-03-26 08:22:34.000000000 +0100 @@ -1,4 +1,10 @@ -2014-03-20: HEAD +2014-03-26: HEAD + - fix gcc aliasing warning + - ctc0 is now slccw0.0.???? + - don't do arping on ptp interfaces + - remove gobal net_is_ptp_im var and put ptp checks into a single function + +2014-03-20: 4.2.14 - don't kill too many processes (bnc #869113) - ensure echo is on (bnc #865956) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.14/global.h new/linuxrc-4.2.15/global.h --- old/linuxrc-4.2.14/global.h 2014-03-10 13:09:19.000000000 +0100 +++ new/linuxrc-4.2.15/global.h 2014-03-26 08:09:51.000000000 +0100 @@ -565,6 +565,7 @@ unsigned ipv4:1; /* do ipv4 config */ unsigned ipv6:1; /* do ipv6 config */ unsigned dhcp_timeout_set:1; /* dhcp_timeout was set explicitly */ + unsigned ptp:1; /* true if interface is ptp */ unsigned do_setup; /* do network setup */ unsigned setup; /* bitmask: do these network setup things */ char *device; /* currently used device */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.14/mkpsfu/mkpsfu.c new/linuxrc-4.2.15/mkpsfu/mkpsfu.c --- old/linuxrc-4.2.14/mkpsfu/mkpsfu.c 2014-01-30 10:59:49.000000000 +0100 +++ new/linuxrc-4.2.15/mkpsfu/mkpsfu.c 2014-03-26 08:20:17.000000000 +0100 @@ -107,6 +107,7 @@ static int assign_char_pos(void); static void add_data(file_data_t *d, void *buffer, unsigned size); static void write_data(char *name); +static uint32_t read_utf32le(void *p); int main(int argc, char **argv) { @@ -204,7 +205,7 @@ for(j = 0; j < sizeof ibuf2; j++) ibuf2[j] = j; iconv(ic2, &ibuf_ptr, &ibuf_left, &obuf_ptr, &obuf_left); for(str = obuf2; str < obuf_ptr; str += 4) { - i = *(int *) str; + i = read_utf32le(str); if(i >= 0x20) add_char(i); } iconv_close(ic2); @@ -234,7 +235,7 @@ if(k >= 0 || (k == -1 && !obuf_left)) { ok = 1; if(!obuf_left) { - i = *(int *) obuf; + i = read_utf32le(obuf); if(i >= 0x20) { // fprintf(stderr, "add char 0x%x\n", i); add_char(i); @@ -955,3 +956,10 @@ } +uint32_t read_utf32le(void *p) +{ + unsigned char *s = p; + + return s[0] + (s[1] << 8) + (s[2] << 16) + (s[3] << 24); +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.14/net.c new/linuxrc-4.2.15/net.c --- old/linuxrc-4.2.14/net.c 2014-03-07 15:03:47.000000000 +0100 +++ new/linuxrc-4.2.15/net.c 2014-03-26 08:09:51.000000000 +0100 @@ -61,8 +61,6 @@ #define NFS_PROGRAM 100003 #define NFS_VERSION 2 -int net_is_ptp_im = FALSE; - #if !defined(NETWORK_CONFIG) # define NETWORK_CONFIG 1 #endif @@ -627,7 +625,13 @@ net_apply_ethtool(config.net.device, config.net.hwaddr); - if(!config.forceip && util_check_exist("/sbin/arping")) { + check_ptp(); + + if( + !config.net.ptp && + !config.forceip && + util_check_exist("/sbin/arping") + ) { sprintf(command, "ifconfig %s up", config.net.device); util_error_trace("net_activate: %s\n", command); rc = system(command); @@ -674,7 +678,7 @@ util_error_trace("net_activate: SIOCSIFADDR failed at %d\n",__LINE__); } - if (net_is_ptp_im) + if (config.net.ptp) { sockaddr_ri.sin_addr = config.net.ptphost.ip; memcpy (&interface_ri.ifr_dstaddr, &sockaddr_ri, sizeof (sockaddr_ri)); @@ -712,7 +716,7 @@ } interface_ri.ifr_flags |= IFF_UP | IFF_RUNNING; - if (net_is_ptp_im) + if (config.net.ptp) interface_ri.ifr_flags |= IFF_POINTOPOINT | IFF_NOARP; else interface_ri.ifr_flags |= IFF_BROADCAST; @@ -725,7 +729,7 @@ memset (&route_ri, 0, sizeof (struct rtentry)); route_ri.rt_dev = config.net.device; - if (net_is_ptp_im) + if (config.net.ptp) { sockaddr_ri.sin_addr = config.net.ptphost.ip; memcpy (&route_ri.rt_dst, &sockaddr_ri, sizeof (sockaddr_ri)); @@ -1472,10 +1476,8 @@ if(choice > 0) { str_copy(&config.net.device, item_devs[choice - 1]); - net_is_ptp_im = FALSE; - if(strstr(config.net.device, "plip") == config.net.device) net_is_ptp_im = TRUE; - if(strstr(config.net.device, "iucv") == config.net.device) net_is_ptp_im = TRUE; - if(strstr(config.net.device, "ctc") == config.net.device) net_is_ptp_im = TRUE; + + check_ptp(); if(item_hds && item_hds[choice - 1]) { hd = item_hds[choice - 1]; @@ -1599,7 +1601,7 @@ s_addr2inet(&config.net.netmask, config.net.hostname.net.s_addr); } - if(net_is_ptp_im) { + if(config.net.ptp) { if(!config.net.ptphost.name) { name2inet(&config.net.ptphost, config.net.hostname.name); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.14/url.c new/linuxrc-4.2.15/url.c --- old/linuxrc-4.2.14/url.c 2014-02-05 15:04:42.000000000 +0100 +++ new/linuxrc-4.2.15/url.c 2014-03-26 08:09:51.000000000 +0100 @@ -2260,7 +2260,6 @@ } -extern int net_is_ptp_im; /* * Setup network interface. * @@ -2311,16 +2310,11 @@ if(config.net.configured == nc_none) config.net.configured = nc_static; - if (config.net.device) { - net_is_ptp_im = FALSE; - if(strstr(config.net.device, "plip") == config.net.device) net_is_ptp_im = TRUE; - if(strstr(config.net.device, "iucv") == config.net.device) net_is_ptp_im = TRUE; - if(strstr(config.net.device, "ctc") == config.net.device) net_is_ptp_im = TRUE; - } + check_ptp(); /* we need at least ip & netmask for static network config */ /* just netmask for PTP devices */ - if(!net_is_ptp_im && (net_config_mask() & 3) != 3) { + if(!config.net.ptp && (net_config_mask() & 3) != 3) { printf( "Sending %s request to %s...\n", config.net.ipv6 ? "DHCP6" : "DHCP", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.14/util.c new/linuxrc-4.2.15/util.c --- old/linuxrc-4.2.14/util.c 2014-01-16 11:11:06.000000000 +0100 +++ new/linuxrc-4.2.15/util.c 2014-03-26 08:09:51.000000000 +0100 @@ -4466,3 +4466,19 @@ } +/* + * Check if interface is a ptp interface and set config.net.ptp accordingly. + */ +void check_ptp() +{ + config.net.ptp = 0; + + if(!config.net.device) return; + + if( + !strncmp(config.net.device, "plip", sizeof "plip" - 1) || + !strncmp(config.net.device, "iucv", sizeof "iucv" - 1) || + !strncmp(config.net.device, "sl", sizeof "sl" - 1) + ) config.net.ptp = 1; +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.14/util.h new/linuxrc-4.2.15/util.h --- old/linuxrc-4.2.14/util.h 2013-12-19 10:03:15.000000000 +0100 +++ new/linuxrc-4.2.15/util.h 2014-03-26 08:09:51.000000000 +0100 @@ -149,3 +149,5 @@ void util_restart(); +void check_ptp(void); + -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org