May 2014 - openSUSE Commits - openSUSE Mailing Lists

commit linuxrc for openSUSE:Factory
by root＠hilbert.suse.de 22 May '14

22 May '14

Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2014-05-22 20:38:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-05-17 22:02:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2014-05-22 20:39:07.000000000 +0200 @@ -1,0 +2,21 @@ +Thu May 22 09:20:19 CEST 2014 - snwint(a)suse.de + +- turn default ipv6 off again (bnc #879127) +- 4.2.29 + +------------------------------------------------------------------- +Wed May 21 16:07:16 CEST 2014 - snwint(a)suse.de + +- rework dhcp handling, ipv6 should be fine now (bnc #868031) +- potential fix for memory corruption (bnc #878357) +- actually parse autoyast2 file +- redirect all wicked output to stderr +- 4.2.28 + +------------------------------------------------------------------- +Mon May 19 10:41:25 CEST 2014 - snwint(a)suse.de + +- Missed one instance of config.hwp.layer2 that needed to be updated. +- 4.2.27 + +------------------------------------------------------------------- Old: ---- linuxrc-4.2.26.tar.xz New: ---- linuxrc-4.2.29.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.Cdr5T7/_old 2014-05-22 20:39:08.000000000 +0200 +++ /var/tmp/diff_new_pack.Cdr5T7/_new 2014-05-22 20:39:08.000000000 +0200 @@ -25,9 +25,9 @@ Summary: SUSE Installation Program License: GPL-3.0+ Group: System/Boot -Version: 4.2.26 +Version: 4.2.29 Release: 0 -Source: linuxrc-4.2.26.tar.xz +Source: linuxrc-4.2.29.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ linuxrc-4.2.26.tar.xz -> linuxrc-4.2.29.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.26/VERSION new/linuxrc-4.2.29/VERSION --- old/linuxrc-4.2.26/VERSION 2014-05-16 16:05:35.000000000 +0200 +++ new/linuxrc-4.2.29/VERSION 2014-05-22 09:20:11.000000000 +0200 @@ -1 +1 @@ -4.2.26 +4.2.29 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.26/auto2.c new/linuxrc-4.2.29/auto2.c --- old/linuxrc-4.2.26/auto2.c 2014-04-24 14:35:53.000000000 +0200 +++ new/linuxrc-4.2.29/auto2.c 2014-05-21 15:29:55.000000000 +0200 @@ -372,10 +372,12 @@ * -- ok this sounds weird but actually makes sense... */ if(config.autoyast2 && !config.autoyast) { - fprintf(stderr, "Downloading AutoYaST file: %s\n", config.autoyast2); - printf("Downloading AutoYaST file: %s\n", config.autoyast2); - fflush(stdout); url = url_set(config.autoyast2); + fprintf(stderr, "Downloading AutoYaST file: %s\n", config.autoyast2); + if(!url->quiet) { + printf("Downloading AutoYaST file: %s\n", config.autoyast2); + fflush(stdout); + } #if defined(__s390__) || defined(__s390x__) if(url->is.network && !config.net.configured) net_activate_s390_devs(); #endif @@ -385,8 +387,12 @@ if(!err) { fprintf(stderr, "setting AutoYaST option to file:///download/autoyast.xml\n"); str_copy(&config.autoyast, "file:///download/autoyast.xml"); - // don't parse it - // file_read_info_file("file:/download/autoyast.xml", kf_cfg); + /* parse it: + * you can embed linuxrc options between lines with '# {start,end}_linuxrc_conf'; + * otherwise the file content is ignored + */ + fprintf(stderr, "parsing AutoYaST file\n"); + file_read_info_file("file:/download/autoyast.xml", kf_cfg); } } @@ -597,7 +603,6 @@ */ void auto2_user_netconfig() { - int win_old; slist_t *sl; if(!config.net.do_setup) return; @@ -628,22 +633,9 @@ for(sl = config.net.devices; sl && config.net.configured == nc_none; sl = sl->next) { str_copy(&config.net.device, sl->key); - printf( - "Sending DHCP request to %s...\n", config.net.device - ); - fflush(stdout); - fprintf(stderr, - "Sending DHCP request to %s... ", config.net.device - ); net_dhcp(); - if( - !config.net.hostname.ok || - !config.net.netmask.ok || - !config.net.broadcast.ok - ) { - fprintf(stderr, "no/incomplete answer.\n"); - } - else { + + if(config.net.dhcp_active) { config.net.configured = nc_dhcp; if(net_activate_ns()) { @@ -657,9 +649,12 @@ } } else { - if(!(win_old = config.win)) util_disp_init(); + int win_old, maybe_interactive; + + maybe_interactive = config.net.setup != NS_DHCP; + if(!(win_old = config.win) && maybe_interactive) util_disp_init(); net_config(); - if(!win_old) util_disp_done(); + if(!win_old && maybe_interactive) util_disp_done(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.26/changelog new/linuxrc-4.2.29/changelog --- old/linuxrc-4.2.26/changelog 2014-05-16 16:05:37.000000000 +0200 +++ new/linuxrc-4.2.29/changelog 2014-05-22 09:20:13.000000000 +0200 @@ -1,4 +1,16 @@ -2014-05-16: HEAD +2014-05-22: HEAD + - turn default ipv6 off again (bnc #879127) + +2014-05-21: 4.2.28 + - rework dhcp handling, ipv6 should be fine now (bnc #868031) + - potential fix for memory corruption (bnc #878357) + - actually parse autoyast2 file + - redirect all wicked output to stderr + +2014-05-16: 4.2.27 + - Missed one instance of config.hwp.layer2 that needed to be updated. + +2014-05-16: 4.2.26 - pass debug option to help scripts 2014-05-15: 4.2.25 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.26/file.c new/linuxrc-4.2.29/file.c --- old/linuxrc-4.2.26/file.c 2014-05-15 10:49:40.000000000 +0200 +++ new/linuxrc-4.2.29/file.c 2014-05-20 11:06:34.000000000 +0200 @@ -2578,7 +2578,7 @@ if(!config.net.hostname.ok || !config.net.netmask.ok) { net_dhcp(); if(!config.net.hostname.ok) { - fprintf(stderr, "%s: DHCP network setup failed\n", config.net.device); + fprintf(stderr, "%s: DHCP%s network setup failed\n", config.net.device, net_dhcp_type()); return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.26/module.c new/linuxrc-4.2.29/module.c --- old/linuxrc-4.2.26/module.c 2013-12-04 12:02:41.000000000 +0100 +++ new/linuxrc-4.2.29/module.c 2014-05-21 11:30:38.000000000 +0200 @@ -38,7 +38,7 @@ #define MENU_WIDTH 55 #define MODULE_CONFIG "module.config" -#define CARDMGR_PIDFILE "/var/run/cardmgr.pid" +#define CARDMGR_PIDFILE "/run/cardmgr.pid" static int mod_types = 0; static int mod_type[MAX_MODULE_TYPES] = {}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.26/net.c new/linuxrc-4.2.29/net.c --- old/linuxrc-4.2.26/net.c 2014-05-15 11:03:39.000000000 +0200 +++ new/linuxrc-4.2.29/net.c 2014-05-21 15:53:44.000000000 +0200 @@ -83,6 +83,7 @@ static int wlan_auth_cb(dia_item_t di); static dia_item_t di_wlan_auth_last = di_none; +static int parse_leaseinfo(char *file); static int net_wicked(void); static int net_dhcp4(void); static int net_dhcp6(void); @@ -297,35 +298,12 @@ /* we need at least ip & netmask for static network config */ if((net_config_mask() & 3) != 3) { - printf( - "Sending %s request to %s...\n", - config.net.ipv6 ? "DHCP6" : "DHCP", - config.net.device - ); - fflush(stdout); - fprintf(stderr, - "sending %s request to %s... ", - config.net.ipv6 ? "DHCP6" : "DHCP", - config.net.device - ); - net_dhcp(); - if( - !config.test && - !config.net.ipv6 && - ( - !config.net.hostname.ok || - !config.net.netmask.ok || - !config.net.broadcast.ok - ) - ) { - fprintf(stderr, "no/incomplete answer.\n"); + if(!config.net.dhcp_active) { config.net.configured = nc_none; - return 0; } - fprintf(stderr, "ok.\n"); config.net.configured = nc_dhcp; } @@ -378,22 +356,9 @@ for(sl = config.net.devices; sl && config.net.configured == nc_none; sl = sl->next) { str_copy(&config.net.device, sl->key); - printf( - "Sending DHCP request to %s...\n", config.net.device - ); - fflush(stdout); - fprintf(stderr, - "Sending DHCP request to %s... ", config.net.device - ); net_dhcp(); - if( - !config.net.hostname.ok || - !config.net.netmask.ok || - !config.net.broadcast.ok - ) { - fprintf(stderr, "no/incomplete answer.\n"); - } - else { + + if(config.net.dhcp_active) { config.net.configured = nc_dhcp; if(net_activate_ns()) { @@ -679,7 +644,8 @@ } memset (&interface_ri, 0, sizeof (struct ifreq)); - strcpy (interface_ri.ifr_name, config.net.device); + strncpy (interface_ri.ifr_name, config.net.device, sizeof interface_ri.ifr_name - 1); + interface_ri.ifr_name[sizeof interface_ri.ifr_name - 1] = 0; sockaddr_ri.sin_family = AF_INET; sockaddr_ri.sin_port = 0; @@ -1583,8 +1549,9 @@ if(config.test) return; + /* write resolv.conf for a static network setup */ if( - !(config.net.ipv6 && config.net.dhcp_active) && + !config.net.dhcp_active && (f = fopen("/etc/resolv.conf", "w")) ) { for(u = 0; u < config.net.nameservers; u++) { @@ -1807,6 +1774,80 @@ /* + * Parse dhcp leaseinfo and set network config vars accordingly. + * Returns 1 to indicate that valid data were found. + */ +int parse_leaseinfo(char *file) +{ + file_t *f0, *f; + char *s; + slist_t *sl0, *sl; + int got_ip = 0; + + f0 = file_read_file(file, kf_dhcp); + + for(f = f0; f; f = f->next) { + switch(f->key) { + case key_ipaddr: + got_ip = 1; + name2inet(&config.net.hostname, f->value); + net_check_address(&config.net.hostname, 0); + break; + + case key_hostname: + str_copy(&config.net.realhostname, f->value); + break; + + case key_netmask: + name2inet(&config.net.netmask, f->value); + net_check_address(&config.net.netmask, 0); + break; + + case key_network: + name2inet(&config.net.network, f->value); + net_check_address(&config.net.network, 0); + break; + + case key_broadcast: + name2inet(&config.net.broadcast, f->value); + net_check_address(&config.net.broadcast, 0); + break; + + case key_gateway: + if((s = strchr(f->value, ' '))) *s = 0; + name2inet(&config.net.gateway, f->value); + net_check_address(&config.net.gateway, 0); + break; + + case key_domain: + if(*f->value) str_copy(&config.net.domain, f->value); + break; + + case key_dns: + for(config.net.nameservers = 0, sl = sl0 = slist_split(' ', f->value); sl; sl = sl->next) { + name2inet(&config.net.nameserver[config.net.nameservers], sl->key); + net_check_address(&config.net.nameserver[config.net.nameservers], 0); + if(++config.net.nameservers >= sizeof config.net.nameserver / sizeof *config.net.nameserver) break; + } + slist_free(sl0); + break; + + case key_nisdomain: + if(*f->value) str_copy(&config.net.nisdomain, f->value); + break; + + default: + break; + } + } + + file_free_file(f0); + + return got_ip; +} + + +/* * Start dhcp client and read dhcp info. * * Global vars changed: @@ -1864,11 +1905,9 @@ */ int net_wicked() { - char cmd[256], file[256], *s; - file_t *f0, *f; + char cmd[256], file[256]; window_t win; int got_ip = 0, i, rc; - slist_t *sl0, *sl; FILE *fp; if(config.net.dhcp_active || config.net.keep) return 0; @@ -1879,88 +1918,44 @@ return 0; } + snprintf(cmd, sizeof cmd, "Sending DHCP%s request to %s...", net_dhcp_type(), config.net.device); if(config.win) { - sprintf(cmd, "Sending %s request...", "DHCP"); dia_info(&win, cmd, MSGTYPE_INFO); } + else { + fprintf(stderr, "%s\n", cmd); + printf("%s\n", cmd); + fflush(stdout); + } - sprintf(file, "/etc/sysconfig/network/ifcfg-%s", config.net.device); + snprintf(file, sizeof file, "/etc/sysconfig/network/ifcfg-%s", config.net.device); fp = fopen(file, "w"); - fprintf(fp, "BOOTPROTO='dhcp'\n"); + fprintf(fp, "BOOTPROTO='dhcp%s'\n", net_dhcp_type()); fprintf(fp, "STARTMODE='auto'\n"); fclose(fp); net_apply_ethtool(config.net.device, config.net.hwaddr); if(config.net.dhcp_timeout_set) { - sprintf(cmd, "wicked ifup --timeout %d %s", config.net.dhcp_timeout, config.net.device); + snprintf(cmd, sizeof cmd, "wicked ifup --timeout %d %s >&2", config.net.dhcp_timeout, config.net.device); } else { - sprintf(cmd, "wicked ifup %s", config.net.device); + snprintf(cmd, sizeof cmd, "wicked ifup %s >&2", config.net.device); } - sprintf(file, "/var/run/wicked/leaseinfo.%s.dhcp.ipv4", config.net.device); - - unlink(file); - - system(cmd); - - f0 = file_read_file(file, kf_dhcp); - - for(f = f0; f; f = f->next) { - switch(f->key) { - case key_ipaddr: - got_ip = 1; - name2inet(&config.net.hostname, f->value); - net_check_address(&config.net.hostname, 0); - break; - - case key_hostname: - str_copy(&config.net.realhostname, f->value); - break; - - case key_netmask: - name2inet(&config.net.netmask, f->value); - net_check_address(&config.net.netmask, 0); - break; - - case key_network: - name2inet(&config.net.network, f->value); - net_check_address(&config.net.network, 0); - break; - - case key_broadcast: - name2inet(&config.net.broadcast, f->value); - net_check_address(&config.net.broadcast, 0); - break; - - case key_gateway: - if((s = strchr(f->value, ' '))) *s = 0; - name2inet(&config.net.gateway, f->value); - net_check_address(&config.net.gateway, 0); - break; - - case key_domain: - if(*f->value) str_copy(&config.net.domain, f->value); - break; - - case key_dns: - for(config.net.nameservers = 0, sl = sl0 = slist_split(' ', f->value); sl; sl = sl->next) { - name2inet(&config.net.nameserver[config.net.nameservers], sl->key); - net_check_address(&config.net.nameserver[config.net.nameservers], 0); - if(++config.net.nameservers >= sizeof config.net.nameserver / sizeof *config.net.nameserver) break; - } - slist_free(sl0); - break; - - case key_nisdomain: - if(*f->value) str_copy(&config.net.nisdomain, f->value); - break; + if(config.net.ipv4) { + snprintf(file, sizeof file, "/run/wicked/leaseinfo.%s.dhcp.ipv4", config.net.device); + unlink(file); + system(cmd); + got_ip = parse_leaseinfo(file); + } - default: - break; - } + if(!got_ip && config.net.ipv6) { + snprintf(file, sizeof file, "/run/wicked/leaseinfo.%s.dhcp.ipv6", config.net.device); + unlink(file); + system(cmd); + got_ip = parse_leaseinfo(file); } if(config.win) win_close(&win); @@ -1973,14 +1968,12 @@ if(config.win) { if(config.net.dhcpfail && strcmp(config.net.dhcpfail, "ignore")) { if(!strcmp(config.net.dhcpfail, "show")) { - sprintf(cmd, "%s configuration failed.", "DHCP"); - dia_info(&win, cmd, MSGTYPE_ERROR); + dia_info(&win, "DHCP configuration failed.", MSGTYPE_ERROR); sleep(4); win_close(&win); } else if(!strcmp(config.net.dhcpfail, "manual")) { - sprintf(cmd, "%s configuration failed.", "DHCP"); - i = dia_yesno(cmd, NO); + i = dia_yesno("DHCP configuration failed.", NO); if(i == YES) { // is_static = 1; // ????? @@ -1990,7 +1983,26 @@ } } - file_free_file(f0); + if(config.net.dhcp_active) { + char *s; + + snprintf(cmd, sizeof cmd, "ok"); + + if((s = inet2str(&config.net.hostname, 4))) { + snprintf(cmd + strlen(cmd), sizeof cmd - strlen(cmd), ", ip = %s/%u", s, config.net.hostname.prefix4); + } + + if((s = inet2str(&config.net.hostname, 6))) { + snprintf(cmd + strlen(cmd), sizeof cmd - strlen(cmd), ", ip = %s/%u", s, config.net.hostname.prefix6); + } + + fprintf(stderr, "%s\n", cmd); + printf("%s\n", cmd); + } + else { + fprintf(stderr, "no/incomplete answer.\n"); + printf("no/incomplete answer.\n"); + } rc = config.net.dhcp_active ? 0 : 1; @@ -2324,7 +2336,8 @@ sock = socket(AF_INET, SOCK_DGRAM, 0); if(sock == -1) return; - strcpy(iface.ifr_name, dev); + strncpy(iface.ifr_name, dev, sizeof iface.ifr_name - 1); + iface.ifr_name[sizeof iface.ifr_name - 1] = 0; iface.ifr_addr.sa_family = AF_INET; ioctl(sock, SIOCGIFFLAGS, &iface); @@ -2675,7 +2688,7 @@ config.hwp.portname ? "-p \"" : "", config.hwp.portname ? config.hwp.portname : "", config.hwp.portname ? "\"" : "", - config.hwp.layer2 == 2 ? "-l" : "", + config.hwp.layer2 == 1 ? "-l" : "", config.hwp.readchan, config.hwp.writechan, config.hwp.datachan); @@ -2702,7 +2715,8 @@ char* ifname = NULL; net_s390_get_ifname(config.hwp.readchan, &ifname); - strcpy(ifr.ifr_name, ifname); + strncpy(ifr.ifr_name, ifname, sizeof ifr.ifr_name - 1); + ifr.ifr_name[sizeof ifr.ifr_name - 1] = 0; free(ifname); if((skfd = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP)) < 0) { @@ -3107,11 +3121,11 @@ fprintf(fp, "STARTMODE='auto'\n"); if((s = inet2str(&config.net.hostname, 4))) { - fprintf(fp, "IPADDR='%s/%u'\n", s, config.net.hostname.prefix4); + fprintf(fp, "IPADDR='%s/%u'\n", s, config.net.hostname.prefix4); } if((s = inet2str(&config.net.hostname, 6))) { - fprintf(fp, "IPADDR='%s/%u'\n", s, config.net.hostname.prefix6); + fprintf(fp, "IPADDR='%s/%u'\n", s, config.net.hostname.prefix6); } fclose(fp); @@ -3178,3 +3192,18 @@ return 0; } + +/* + * Return currently active dhcp type ("4", "6", or "" (= both)). + */ +char *net_dhcp_type() +{ + static char t[2] = "4"; + + t[0] = 0; + if(config.net.ipv4 && !config.net.ipv6) t[0] = '4'; + if(!config.net.ipv4 && config.net.ipv6) t[0] = '6'; + + return t; +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.26/net.h new/linuxrc-4.2.29/net.h --- old/linuxrc-4.2.26/net.h 2013-11-18 14:06:40.000000000 +0100 +++ new/linuxrc-4.2.29/net.h 2014-05-20 10:55:55.000000000 +0200 @@ -25,4 +25,4 @@ char *net_if2module(char *net_if); void net_apply_ethtool(char *device, char *hwaddr); int wlan_setup(void); - +char *net_dhcp_type(void); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.26/url.c new/linuxrc-4.2.29/url.c --- old/linuxrc-4.2.26/url.c 2014-05-14 16:24:25.000000000 +0200 +++ new/linuxrc-4.2.29/url.c 2014-05-21 15:09:59.000000000 +0200 @@ -2318,35 +2318,12 @@ /* we need at least ip & netmask for static network config */ /* just netmask for PTP devices */ if(!config.net.ptp && (net_config_mask() & 3) != 3) { - printf( - "Sending %s request to %s...\n", - config.net.ipv6 ? "DHCP6" : "DHCP", - url->used.device - ); - fflush(stdout); - fprintf(stderr, - "sending %s request to %s... ", - config.net.ipv6 ? "DHCP6" : "DHCP", - url->used.device - ); - net_dhcp(); - if( - !config.test && - !config.net.ipv6 && - ( - !config.net.hostname.ok || - !config.net.netmask.ok || - !config.net.broadcast.ok - ) - ) { - fprintf(stderr, "no/incomplete answer.\n"); + if(!config.net.dhcp_active) { config.net.configured = nc_none; - return 0; } - fprintf(stderr, "ok.\n"); config.net.configured = nc_dhcp; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit util-linux for openSUSE:Factory
by root＠hilbert.suse.de 22 May '14

22 May '14

Hello community, here is the log from the commit of package util-linux for openSUSE:Factory checked in at 2014-05-22 20:38:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/util-linux (Old) and /work/SRC/openSUSE:Factory/.util-linux.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "util-linux" Changes: -------- --- /work/SRC/openSUSE:Factory/util-linux/util-linux.changes 2014-05-03 16:51:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.util-linux.new/util-linux.changes 2014-05-22 20:39:02.000000000 +0200 @@ -1,0 +2,21 @@ +Fri May 16 15:10:53 UTC 2014 - sweet_f_a(a)gmx.de + +- Prevent excessive clock drift calculations (bnc#871698, + util-linux-prevent-excessive-clock-drift-calculations.patch), + committed by sbrabec(a)suse.cz + +------------------------------------------------------------------- +Thu May 8 08:15:04 UTC 2014 - werner(a)suse.de + +- Modify patch support-other-tty-lines-not-vconsole.patch to + make it work on virtual console +- Modify patch agetty-on-s390-on-dev-3270-tty1-line.patch + to add the missed 3270 support upstream + +------------------------------------------------------------------- +Wed May 7 14:12:32 UTC 2014 - werner(a)suse.de + +- Add patch support-other-tty-lines-not-vconsole.patch + to be able to support console lines like xvc and hvc + +------------------------------------------------------------------- New: ---- support-other-tty-lines-not-vconsole.patch util-linux-prevent-excessive-clock-drift-calculations.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ util-linux.spec ++++++ --- /var/tmp/diff_new_pack.Q2hCQU/_old 2014-05-22 20:39:06.000000000 +0200 +++ /var/tmp/diff_new_pack.Q2hCQU/_new 2014-05-22 20:39:06.000000000 +0200 @@ -104,6 +104,8 @@ Patch4: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff # disable encryption Patch12: util-linux-2.23.1-noenc-suse.diff +# PATCH-FIX-SUSE Be aware that there are e.g. xvc/hvc +Patch14: support-other-tty-lines-not-vconsole.patch # PATCH-FIX-SUSE -- Let agetty not be fooled by locked termios srtucture Patch15: agetty-fooled-on-serial-line-due-plymouth.patch # PATCH-FIX-SUSE -- Let agetty detect /dev/3270/tty1 as device not as baud rate @@ -126,6 +128,8 @@ Patch31: blkid-convert-superblocks-to-new-calling-convention.patch # PATH-FIX-UPSTREAM util-linux-libblkid-ext-probe.patch bnc864703 sbrabec(a)suse.cz -- libblkid: Drop the broken ext2/ext3/ext4 discrimination logic. Patch32: util-linux-libblkid-ext-probe.patch +# PATCH-FIX-UPSTREAM bnc871698 sbrabec(a)suse.cz +Patch33: util-linux-prevent-excessive-clock-drift-calculations.patch ## ## klogconsole @@ -247,6 +251,7 @@ %patch2 -p1 %patch4 -p1 %patch12 -p1 +%patch14 -p0 %patch15 -p0 %patch16 -p0 %patch17 -p0 @@ -260,6 +265,7 @@ %patch30 -p1 %patch31 -p1 %patch32 -p1 +%patch33 -p1 # # setctsid cp -p %{S:22} %{S:23} . ++++++ agetty-on-s390-on-dev-3270-tty1-line.patch ++++++ --- /var/tmp/diff_new_pack.Q2hCQU/_old 2014-05-22 20:39:06.000000000 +0200 +++ /var/tmp/diff_new_pack.Q2hCQU/_new 2014-05-22 20:39:06.000000000 +0200 @@ -1,14 +1,21 @@ -Be aware that on s390 the 3270 terminal line is found at -/dev/3270/tty<X>. That is that the baud speed rate numbers -have to be identified in a unique way. - --- - agetty.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) + login-utils/sulogin.c | 8 +++++++- + term-utils/agetty.c | 15 ++++++++++----- + 2 files changed, 17 insertions(+), 6 deletions(-) --- term-utils/agetty.c -+++ term-utils/agetty.c 2014-02-04 09:33:13.162735763 +0000 -@@ -568,6 +568,8 @@ static void login_options_to_argv(char * ++++ term-utils/agetty.c 2014-05-08 08:08:26.384484940 +0000 +@@ -51,7 +51,8 @@ + # define DEFAULT_VCTERM "linux" + # endif + # if defined (__s390__) || defined (__s390x__) +-# define DEFAULT_TTYS0 "ibm327x" ++# define DEFAULT_TTYS0 "dumb" ++# define DEFAULT_TTY32 "ibm327x" + # define DEFAULT_TTYS1 "vt220" + # endif + # ifndef DEFAULT_STERM +@@ -571,6 +572,8 @@ static void login_options_to_argv(char * *argc = i; } @@ -17,7 +24,7 @@ /* Parse command-line arguments. */ static void parse_args(int argc, char **argv, struct options *op) { -@@ -746,7 +748,7 @@ static void parse_args(int argc, char ** +@@ -749,7 +752,7 @@ static void parse_args(int argc, char ** } /* Accept "tty", "baudrate tty", and "tty baudrate". */ @@ -26,7 +33,7 @@ /* Assume BSD style speed. */ parse_speeds(op, argv[optind++]); if (argc < optind + 1) { -@@ -758,7 +760,7 @@ static void parse_args(int argc, char ** +@@ -761,7 +764,7 @@ static void parse_args(int argc, char ** op->tty = argv[optind++]; if (argc > optind) { char *v = argv[optind++]; @@ -35,3 +42,37 @@ parse_speeds(op, v); else op->speeds[op->numspeed++] = bcode("9600"); +@@ -1071,9 +1074,11 @@ static void open_tty(char *tty, struct t + * higher. Whereas the second serial line on a S/390(x) is + * a real character terminal which is compatible with VT220. + */ +- if (strcmp(op->tty, "ttyS0") == 0) ++ if (strcmp(op->tty, "ttyS0") == 0) /* linux/drivers/s390/char/con3215.c */ + op->term = DEFAULT_TTYS0; +- else if (strcmp(op->tty, "ttyS1") == 0) ++ else if (strncmp(op->tty, "3270/tty", 8) == 0) /* linux/drivers/s390/char/con3270.c */ ++ op->term = DEFAULT_TTY32; ++ else if (strcmp(op->tty, "ttyS1") == 0) /* linux/drivers/s390/char/sclp_vt220.c */ + op->term = DEFAULT_TTYS1; + } + #endif +--- login-utils/sulogin.c ++++ login-utils/sulogin.c 2014-05-08 08:22:38.572781002 +0000 +@@ -189,10 +189,16 @@ static void tcfinal(struct console *con) + setenv("TERM", "linux", 1); + return; + } +- if (con->flags & CON_NOTTY) ++ if (con->flags & CON_NOTTY) { ++ setenv("TERM", "dumb", 1); + return; ++ } + ++#if defined (__s390__) || defined (__s390x__) ++ setenv("TERM", "dumb", 1); ++#else + setenv("TERM", "vt102", 1); ++#endif + tio = &con->tio; + fd = con->fd; + ++++++ support-other-tty-lines-not-vconsole.patch ++++++ --- login-utils/sulogin.c | 17 ++++++++++++----- term-utils/agetty.c | 23 +++++++++++------------ 2 files changed, 23 insertions(+), 17 deletions(-) --- login-utils/sulogin.c +++ login-utils/sulogin.c 2014-05-08 08:01:13.102622002 +0000 @@ -49,6 +49,11 @@ # include <selinux/get_context_list.h> #endif +#ifdef __linux__ +# include <sys/kd.h> +# include <sys/param.h> +#endif + #include "c.h" #include "closestream.h" #include "nls.h" @@ -142,10 +147,14 @@ static void tcinit(struct console *con) return; } - /* Handle serial lines here */ - if (ioctl(fd, TIOCMGET, (char *) &mode) == 0) { + /* Handle lines other than virtual consoles here */ +#if defined(KDGKBMODE) + if (ioctl(fd, KDGKBMODE, &mode) < 0) +#endif + { speed_t ispeed, ospeed; struct winsize ws; + errno = 0; /* this is a modem line */ con->flags |= CON_SERIAL; @@ -191,9 +200,7 @@ static void tcinit(struct console *con) goto setattr; } #if defined(IUTF8) && defined(KDGKBMODE) - /* Detect mode of current keyboard setup, e.g. for UTF-8 */ - if (ioctl(fd, KDGKBMODE, &mode) < 0) - mode = K_RAW; + /* Handle mode of current keyboard setup, e.g. for UTF-8 */ switch(mode) { case K_UNICODE: setlocale(LC_CTYPE, "C.UTF-8"); --- term-utils/agetty.c +++ term-utils/agetty.c 2014-05-08 08:02:16.786235584 +0000 @@ -139,6 +139,7 @@ struct options { int nice; /* Run login with this priority */ int numspeed; /* number of baud rates to try */ int clocal; /* CLOCAL_MODE_* */ + int kbmode; /* Keyboard mode if virtual console */ speed_t speeds[MAX_SPEED]; /* baud rates to be tried */ }; @@ -936,7 +937,7 @@ static void update_utmp(struct options * static void open_tty(char *tty, struct termios *tp, struct options *op) { const pid_t pid = getpid(); - int serial, closed = 0; + int closed = 0; /* Set up new standard input, unless we are given an already opened port. */ @@ -1080,15 +1081,18 @@ static void open_tty(char *tty, struct t #endif /* * Detect if this is a virtual console or serial/modem line. - * In case of a virtual console the ioctl TIOCMGET fails and - * the error number will be set to EINVAL. + * In case of a virtual console the ioctl KDGKBMODE succeeds + * whereas on other lines it will fails. */ - if (ioctl(STDIN_FILENO, TIOCMGET, &serial) < 0 && (errno == EINVAL)) { + if (ioctl(STDIN_FILENO, KDGKBMODE, &op->kbmode) == 0) { op->flags |= F_VCONSOLE; if (!op->term) op->term = DEFAULT_VCTERM; - } else if (!op->term) - op->term = DEFAULT_STERM; + } else { + op->kbmode = K_RAW; + if (!op->term) + op->term = DEFAULT_STERM; + } setenv("TERM", op->term, 1); } @@ -1122,12 +1126,7 @@ static void termio_init(struct options * if (op->flags & F_VCONSOLE) { #if defined(IUTF8) && defined(KDGKBMODE) - int mode; - - /* Detect mode of current keyboard setup, e.g. for UTF-8 */ - if (ioctl(STDIN_FILENO, KDGKBMODE, &mode) < 0) - mode = K_RAW; - switch(mode) { + switch(op->kbmode) { case K_UNICODE: setlocale(LC_CTYPE, "C.UTF-8"); op->flags |= F_UTF8; ++++++ util-linux-prevent-excessive-clock-drift-calculations.patch ++++++ >From 654e902731ea15a3494a3831b78d2b9f1cd1408d Mon Sep 17 00:00:00 2001 From: Ruediger Meier <ruediger.meier(a)ga-group.nl> Date: Fri, 16 May 2014 17:01:43 +0200 Subject: [PATCH] Prevent excessive clock drift calculations Squashed commit of the following: commit f55b4b45126b657fe02f5f0d3d7fde740e6a6247 Author: Karel Zak <kzak(a)redhat.com> Date: Tue May 6 12:51:42 2014 +0200 hwclock: fix typo Reported-by: Stanislav Brabec <sbrabec(a)suse.cz> Signed-off-by: Karel Zak <kzak(a)redhat.com> commit db8fc5f37728810bdd5b865ac420c31714e35def Author: Stanislav Brabec <sbrabec(a)suse.cz> Date: Mon May 5 20:49:49 2014 +0200 hwclock: Check drift value in /etc/adjtime Due to bug in older versions of hwclock, /etc/adjtime can contain excessive drift value (up to many years per day). Prevent it from applying. Signed-off-by: Stanislav Brabec <sbrabec(a)suse.cz> commit f196fd1a5f8fff63635fd88b5a0f0bbc96978df2 Author: Stanislav Brabec <sbrabec(a)suse.cz> Date: Mon May 5 20:49:29 2014 +0200 hwclock: Prevent excessive drift values Failure of CMOS battery can cause writing of excessive drift values (up to many years per day). This causes excessive hwclock adjustment next time, which may lead to overflow in calculate_adjustment() (and hang before 4a44a54b). Prevent this situation, check drift for limits and reset drift to zero instead. Steps to reproduce: mv /etc/adjtime /etc/adjtime.backup rm /etc/adjtime hwclock --set --date 2001-01-01\ 01:00:00 changing of /etc/adjtime. mv /etc/adjtime /etc/adjtime.saved hwclock --set --date 2001-01-02\ 01:00:01 mv /etc/adjtime.saved /etc/adjtime echo "======= The /etc/adjtime has a \"correct\" look:" cat /etc/adjtime hwclock --debug --systohc --utc echo "======= The /etc/adjtime now has deeply failed drift value:" cat /etc/adjtime mv /etc/adjtime /etc/adjtime.saved hwclock --set --date 2015-01-01\ 01:00:00 mv /etc/adjtime.saved /etc/adjtime hwclock --debug --adjust echo "======= And the last /etc/adjtime:" cat /etc/adjtime mv /etc/adjtime.backup /etc/adjtime hwclock --systohc --utc Signed-off-by: Stanislav Brabec <sbrabec(a)suse.cz> Signed-off-by: Ruediger Meier <ruediger.meier(a)ga-group.nl> --- sys-utils/hwclock.c | 47 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c index 395b5c3..0abf01f 100644 --- a/sys-utils/hwclock.c +++ b/sys-utils/hwclock.c @@ -91,6 +91,11 @@ struct clock_ops *ur; #define FLOOR(arg) ((arg >= 0 ? (int) arg : ((int) arg) - 1)); +/* Maximal clock adjustment in seconds per day. + (adjtime() glibc call has 2145 seconds limit on i386, so it is good enough for us as well, + 43219 is a maximal safe value preventing exact_adjustment overflow.) */ +#define MAX_DRIFT 2145.0 + const char *adj_file_name = NULL; struct adjtime { @@ -1008,6 +1013,7 @@ adjust_drift_factor(struct adjtime *adjtime_p, double adj_days, cal_days; double exp_drift, unc_drift; double factor_adjust; + double drift_factor; /* Adjusted time units per hardware time unit */ atime_per_htime = 1.0 + adjtime_p->drift_factor / sec_per_day; @@ -1033,16 +1039,28 @@ adjust_drift_factor(struct adjtime *adjtime_p, /* Amount to add to previous drift factor */ factor_adjust = unc_drift / cal_days; - if (debug) - printf(_("Clock drifted %.1f seconds in the past " - "%d seconds in spite of a drift factor of " - "%f seconds/day.\n" - "Adjusting drift factor by %f seconds/day\n"), - unc_drift, - (int)(nowtime - adjtime_p->last_calib_time), - adjtime_p->drift_factor, factor_adjust); - - adjtime_p->drift_factor += factor_adjust; + /* New drift factor */ + drift_factor = adjtime_p->drift_factor + factor_adjust; + + if (abs(drift_factor) > MAX_DRIFT) { + if (debug) + printf(_("Clock drift factor was calculated as " + "%f seconds/day.\n" + "It is far too much. Resetting to zero.\n"), + drift_factor); + drift_factor = 0; + } else { + if (debug) + printf(_("Clock drifted %.1f seconds in the past " + "%d seconds in spite of a drift factor of " + "%f seconds/day.\n" + "Adjusting drift factor by %f seconds/day\n"), + unc_drift, + (int)(nowtime - adjtime_p->last_calib_time), + adjtime_p->drift_factor, factor_adjust); + } + + adjtime_p->drift_factor = drift_factor; } adjtime_p->last_calib_time = nowtime; @@ -1190,9 +1208,12 @@ do_adjustment(struct adjtime *adjtime_p, adjtime_p->dirty = TRUE; } else if (adjtime_p->last_adj_time == 0) { if (debug) - printf(_ - ("Not setting clock because last adjustment time is zero, " - "so history is bad.")); + printf(_("Not setting clock because last adjustment time is zero, " + "so history is bad.\n")); + } else if (abs(adjtime_p->drift_factor) > MAX_DRIFT) { + if (debug) + printf(_("Not setting clock because drift factor %f is far too high.\n"), + adjtime_p->drift_factor); } else { int adjustment; /* Number of seconds we must insert in the Hardware Clock */ -- 1.8.4.5 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rpmlint for openSUSE:Factory
by root＠hilbert.suse.de 22 May '14

22 May '14

Hello community, here is the log from the commit of package rpmlint for openSUSE:Factory checked in at 2014-05-22 20:38:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpmlint (Old) and /work/SRC/openSUSE:Factory/.rpmlint.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rpmlint" Changes: -------- --- /work/SRC/openSUSE:Factory/rpmlint/rpmlint.changes 2014-04-25 16:11:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rpmlint.new/rpmlint.changes 2014-05-22 20:38:59.000000000 +0200 @@ -1,0 +2,22 @@ +Mon May 19 13:20:06 UTC 2014 - meissner(a)suse.com + +- enable org.selinux.service and org.selinux.conf of policycoreutils + (pending more review) bnc#878631 + +------------------------------------------------------------------- +Thu May 8 08:52:02 UTC 2014 - dmueller(a)suse.com + +- add 0001-Set-Python-3.4-magic-number-to-3310.patch (bnc#876470) + +------------------------------------------------------------------- +Tue May 6 08:05:16 UTC 2014 - lnussel(a)suse.de + +- dd filter expections for filesystem package + +------------------------------------------------------------------- +Mon May 5 15:17:24 UTC 2014 - lnussel(a)suse.de + +- disallow /var/run and /var/lock + (rpmlint-1.5-disallow-var-run-and-var-lock.diff) + +------------------------------------------------------------------- @@ -4,0 +27 @@ + New: ---- 0001-Set-Python-3.4-magic-number-to-3310.patch rpmlint-1.5-disallow-var-run-and-var-lock.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpmlint.spec ++++++ --- /var/tmp/diff_new_pack.gJqpfn/_old 2014-05-22 20:39:02.000000000 +0200 +++ /var/tmp/diff_new_pack.gJqpfn/_new 2014-05-22 20:39:02.000000000 +0200 @@ -128,6 +128,9 @@ Patch95: invalid-filerequires.diff Patch96: rpmlint-decode-fix.diff Patch97: rpmlint-fix-unexpanded-macros-for-array-values.patch +# PATCH-FIX-UPSTREAM: lnussel(a)suse.de - disallow /var/run and /var/lock +Patch98: rpmlint-1.5-disallow-var-run-and-var-lock.diff +Patch99: 0001-Set-Python-3.4-magic-number-to-3310.patch %py_requires @@ -208,6 +211,8 @@ %patch95 %patch96 -p1 %patch97 -p1 +%patch98 -p1 +%patch99 -p1 cp -p %{SOURCE2} . # Only move top-level python files chmod 0755 rpmlint-checks-master/*.py ++++++ 0001-Set-Python-3.4-magic-number-to-3310.patch ++++++ >From 0929683e2544813d65ef85ae49b52ccdc6662746 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke <saschpe(a)mailbox.org> Date: Tue, 1 Apr 2014 12:47:30 +0200 Subject: [PATCH] Set Python-3.4 magic number to 3310 This is the final magic number of the 3.4 release. --- FilesCheck.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: rpmlint-1.5/FilesCheck.py =================================================================== --- rpmlint-1.5.orig/FilesCheck.py +++ rpmlint-1.5/FilesCheck.py @@ -741,7 +741,7 @@ _python_magic_values = { '3.1': 3150, '3.2': 3180, '3.3': 3230, - '3.4': 3260, + '3.4': 3310, } def get_expected_pyc_magic(path): ++++++ config ++++++ --- /var/tmp/diff_new_pack.gJqpfn/_old 2014-05-22 20:39:02.000000000 +0200 +++ /var/tmp/diff_new_pack.gJqpfn/_new 2014-05-22 20:39:02.000000000 +0200 @@ -613,7 +613,10 @@ "nm-openswan-service.conf", # baloo, formerly nepomuk (bnc#866131) "org.kde.baloo.filewatch.conf", - "org.kde.baloo.filewatch.service" + "org.kde.baloo.filewatch.service", + # policycoreutils new service/config (bnc#878631) + "org.selinux.service", + "org.selinux.conf" )) setOption("PAMModules.WhiteList", ( @@ -755,10 +758,31 @@ addFilter("non-standard-dir-in-usr openwin") addFilter("ibcs2 non-standard-dir-in-usr i486-sysv4") addFilter("shlibs5 non-standard-dir-in-usr i486-linux-libc5") -addFilter("filesystem dir-or-file") -addFilter("filesystem hidden-") addFilter("explicit-lib-dependency libtool") +# filesystem package needs special exceptions +addFilter("^filesystem\..*: dir-or-file-in-var-run") +addFilter("^filesystem\..*: dir-or-file-in-var-lock") +addFilter("^filesystem\..*: dir-or-file-in-var-tmp") +addFilter("^filesystem\..*: dir-or-file-in-var-run") +addFilter("^filesystem\..*: dir-or-file-in-var-lock") +addFilter("^filesystem\..*: dir-or-file-in-usr-tmp") +addFilter("^filesystem\..*: dir-or-file-in-tmp") +addFilter("^filesystem\..*: dir-or-file-in-mnt") +addFilter("^filesystem\..*: dir-or-file-in-home") +addFilter("^filesystem\..*: hidden-file-or-dir /root/.gnupg") +addFilter("^filesystem\..*: hidden-file-or-dir /root/.gnupg") +addFilter("^filesystem\..*: hidden-file-or-dir /etc/skel/.config") +addFilter("^filesystem\..*: hidden-file-or-dir /etc/skel/.local") +addFilter("^filesystem\..*: hidden-file-or-dir /tmp/.X11-unix") +addFilter("^filesystem\..*: hidden-file-or-dir /tmp/.ICE-unix") +addFilter("^filesystem\..*: hidden-file-or-dir /etc/skel/.fonts") +addFilter("^filesystem\..*: suse-filelist-forbidden-fhs23") +addFilter("^filesystem\..*: suse-filelist-forbidden-opt") +addFilter("^filesystem\..*: non-standard-uid /var/lib/nobody nobody") +addFilter("^filesystem\..*: missing-dependency-to-cron") +# has arch specific dirs in /usr +addFilter("^filesystem\..*: no-binary") # suppress any errors about internal packages addFilter("^qa\S+: [EWI]:") ++++++ extend-suse-conffiles-check.diff ++++++ --- /var/tmp/diff_new_pack.gJqpfn/_old 2014-05-22 20:39:02.000000000 +0200 +++ /var/tmp/diff_new_pack.gJqpfn/_new 2014-05-22 20:39:02.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- FilesCheck.py.orig +++ FilesCheck.py -@@ -1176,7 +1176,7 @@ class FilesCheck(AbstractCheck.AbstractC +@@ -1179,7 +1179,7 @@ class FilesCheck(AbstractCheck.AbstractC if nonexec_file and not docdir_examples_regex.search(f): printWarning(pkg, 'spurious-executable-perm', f) elif f.startswith('/etc/') and f not in config_files and \ ++++++ invalid-filerequires.diff ++++++ --- /var/tmp/diff_new_pack.gJqpfn/_old 2014-05-22 20:39:02.000000000 +0200 +++ /var/tmp/diff_new_pack.gJqpfn/_new 2014-05-22 20:39:02.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- TagsCheck.py.orig +++ TagsCheck.py -@@ -420,6 +420,7 @@ invalid_version_regex = re.compile('([0- +@@ -421,6 +421,7 @@ invalid_version_regex = re.compile('([0- # () are here for grouping purpose in the regexp forbidden_words_regex = re.compile('(' + Config.getOption('ForbiddenWords') + ')', re.IGNORECASE) valid_buildhost_regex = re.compile(Config.getOption('ValidBuildHost')) @@ -10,7 +10,7 @@ use_epoch = Config.getOption('UseEpoch', False) use_utf8 = Config.getOption('UseUTF8', Config.USEUTF8_DEFAULT) max_line_len = Config.getOption('MaxLineLength', 79) -@@ -602,6 +603,9 @@ class TagsCheck(AbstractCheck.AbstractCh +@@ -599,6 +600,9 @@ class TagsCheck(AbstractCheck.AbstractCh if d[0].startswith('/usr/local/'): printError(pkg, 'invalid-dependency', d[0]) @@ -20,7 +20,7 @@ if is_source: if lib_devel_number_regex.search(d[0]): printError(pkg, 'invalid-build-requires', d[0]) -@@ -1090,6 +1094,12 @@ explicit Requires: tags.''', +@@ -1106,6 +1110,12 @@ explicit Requires: tags.''', '''This package provides 2 times the same capacity. It should only provide it once.''', ++++++ remove-expand-macros.diff ++++++ --- /var/tmp/diff_new_pack.gJqpfn/_old 2014-05-22 20:39:02.000000000 +0200 +++ /var/tmp/diff_new_pack.gJqpfn/_new 2014-05-22 20:39:02.000000000 +0200 @@ -8,7 +8,7 @@ =================================================================== --- TagsCheck.py.orig +++ TagsCheck.py -@@ -432,15 +432,6 @@ so_dep_regex = re.compile(r'\.so(\.[0-9a +@@ -431,15 +431,6 @@ so_dep_regex = re.compile(r'\.so(\.[0-9a # we assume that no rpm packages existed before rpm itself existed... oldest_changelog_timestamp = calendar.timegm(time.strptime("1995-01-01", "%Y-%m-%d")) @@ -24,7 +24,7 @@ _enchant_checkers = {} def spell_check(pkg, str, fmt, lang, ignored): -@@ -857,30 +848,12 @@ class TagsCheck(AbstractCheck.AbstractCh +@@ -864,30 +855,12 @@ class TagsCheck(AbstractCheck.AbstractCh (apply(Pkg.formatRequire, obs), apply(Pkg.formatRequire, prov))) ++++++ rpmlint-1.5-Fix-setgroups-error-name.diff ++++++ --- /var/tmp/diff_new_pack.gJqpfn/_old 2014-05-22 20:39:02.000000000 +0200 +++ /var/tmp/diff_new_pack.gJqpfn/_new 2014-05-22 20:39:02.000000000 +0200 @@ -11,7 +11,7 @@ =================================================================== --- rpmlint-1.5.orig/BinariesCheck.py +++ rpmlint-1.5/BinariesCheck.py -@@ -514,7 +514,7 @@ class BinariesCheck(AbstractCheck.Abstra +@@ -518,7 +518,7 @@ class BinariesCheck(AbstractCheck.Abstra printError(pkg, 'missing-PT_GNU_STACK-section', fname) if bin_info.setgid and bin_info.setuid and not bin_info.setgroups: ++++++ rpmlint-1.5-disallow-var-run-and-var-lock.diff ++++++ >From c45057466e8e40bbb36fa90faa10a2b678c25ba2 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel <ludwig.nussel(a)suse.de> Date: Wed, 30 Apr 2014 16:35:20 +0200 Subject: [PATCH rpmlint] disallow /var/run and /var/lock Distros moved to having /var/run and /var/lock as symlinks to /run resp /run/lock. Therefore packages must no longer put files there at all. Also, refactor the code for dir-or-file-in-* and make it configurable. --- FilesCheck.py | 77 +++++++++++++++++++++++------------------------------------ config | 4 ++++ 2 files changed, 34 insertions(+), 47 deletions(-) Index: rpmlint-1.5/FilesCheck.py =================================================================== --- rpmlint-1.5.orig/FilesCheck.py +++ rpmlint-1.5/FilesCheck.py @@ -559,12 +559,9 @@ STANDARD_DIRS = ( '/var/lib/nobody', '/var/lib/pam_devperm', '/var/lib/wwwrun', - '/var/lock', - '/var/lock/subsys', '/var/log', '/var/mail', '/var/opt', - '/var/run', '/var/spool', '/var/spool/clientmqueue', '/var/spool/locks', @@ -589,7 +586,19 @@ DEFAULT_STANDARD_GROUPS = ('root', 'bin' 'shutdown', 'halt', 'mail', 'news', 'uucp', 'man', 'nobody',) -tmp_regex = re.compile('^(/var|/usr)?/tmp/') +DEFAULT_DISALLOWED_DIRS = ( + '/home', + '/mnt', + '/opt', + '/tmp', + '/usr/local', + '/usr/tmp', + '/var/local', + '/var/lock', + '/var/run', + '/var/tmp', +) + sub_bin_regex = re.compile('^(/usr)?/s?bin/\S+/') backup_regex = re.compile('(~|\#[^/]+\#|\.orig|\.orig\.gz|\.rej)$') compr_regex = re.compile('\.(gz|z|Z|zip|bz2|lzma|xz)$') @@ -653,6 +662,8 @@ use_relative_symlinks = Config.getOption standard_groups = Config.getOption('StandardGroups', DEFAULT_STANDARD_GROUPS) standard_users = Config.getOption('StandardUsers', DEFAULT_STANDARD_USERS) +disallowed_dirs = Config.getOption('DisallowedDirs', DEFAULT_DISALLOWED_DIRS) + non_readable_regexs = (re.compile('^/var/log/'), re.compile('^/etc/(g?shadow-?|securetty)$')) @@ -871,19 +882,13 @@ class FilesCheck(AbstractCheck.AbstractC is_kernel_package: printError(pkg, "kernel-modules-not-in-kernel-packages", f) - for i in ['mnt','opt','usr-local','var-local','home']: - if f.startswith('/%s/' % i.replace('-','/')): - printError(pkg, 'dir-or-file-in-%s' % i, f) - - if tmp_regex.search(f): - printError(pkg, 'dir-or-file-in-tmp', f) + for i in disallowed_dirs: + if f.startswith(i): + printError(pkg, 'dir-or-file-in-%s' % '-'.join(i.split('/')[1:]), f) - elif f.startswith('/var/run/'): + if f.startswith('/run/'): if f not in ghost_files: - printWarning(pkg, 'non-ghost-in-var-run', f) - elif f.startswith('/var/lock/'): - if f not in ghost_files: - printWarning(pkg, 'non-ghost-in-var-lock', f) + printWarning(pkg, 'non-ghost-in-run', f) elif sub_bin_regex.search(f): printError(pkg, 'subdir-in-bin', f) elif '/site_perl/' in f: @@ -1466,35 +1471,10 @@ install-info.''', '''You have a perl temporary file in your package. Usually, this file is beginning with a dot (.) and contain "perl" in its name.''', -'dir-or-file-in-tmp', -'''A file in the package is located in /tmp. It's not permitted -for packages to install files in this directory.''', - -'dir-or-file-in-mnt', -'''A file in the package is located in /mnt. It's not permitted -for packages to install files in this directory.''', - -'dir-or-file-in-opt', -'''A file in the package is located in /opt. It's not permitted -for packages to install files in this directory.''', - -'dir-or-file-in-usr-local', -'''A file in the package is located in /usr/local. It's not permitted -for packages to install files in this directory.''', - -'dir-or-file-in-var-local', -'''A file in the package is located in /var/local. It's not permitted -for packages to install files in this directory.''', - -'non-ghost-in-var-run', -'''A file or directory in the package is located in /var/run. Files installed -in this directory should be marked as %ghost and created at runtime to work -properly in tmpfs /var/run setups.''', - -'non-ghost-in-var-lock', -'''A file or directory in the package is located in /var/lock. Files installed +'non-ghost-in-run', +'''A file or directory in the package is located in /run. Files installed in this directory should be marked as %ghost and created at runtime to work -properly in tmpfs /var/lock setups.''', +properly in tmpfs /run setups.''', 'subdir-in-bin', '''The package contains a subdirectory in /usr/bin. It's not permitted to @@ -1505,10 +1485,6 @@ create a subdir there. Create it in /usr by an editor or resulting from applying unclean (fuzzy, or ones with line offsets) patches.''', -'dir-or-file-in-home', -'''A file in the package is located in /home. It's not permitted -for packages to install files in this directory.''', - 'version-control-internal-file', '''You have included file(s) internally used by a version control system in the package. Move these files out of the package and rebuild it.''', @@ -1832,6 +1808,13 @@ as part of the example documentation mea use it and setup a insecure configuration.''' ) +for i in disallowed_dirs: + addDetails('dir-or-file-in-%s' % '-'.join(i.split('/')[1:]), + '''A file in the package is located in %s. It's not permitted +for packages to install files in this directory.''' % i) + + + # FilesCheck.py ends here # Local variables: Index: rpmlint-1.5/config =================================================================== --- rpmlint-1.5.orig/config +++ rpmlint-1.5/config @@ -126,6 +126,10 @@ from Config import * # Type: tuple of strings, see DEFAULT_STANDARD_USERS in FilesCheck #setOption("StandardUsers", ()) +# List of directory prefixes that are not allowed in packages +# Type: tuple of strings, see DEFAULT_DISALLOWED_DIRS in FilesCheck +#setOption("DisallowedDirs", ('/home', '/mnt')) + # List of directories considered to be system default library search paths. # Type: tuple of strings, default: see DEFAULT_SYSTEM_LIB_PATHS in BinariesCheck #setOption("SystemLibPaths", ('/lib', '/lib64', '/usr/lib', '/usr/lib64')) ++++++ rpmlint-fix-unexpanded-macros-for-array-values.patch ++++++ --- /var/tmp/diff_new_pack.gJqpfn/_old 2014-05-22 20:39:02.000000000 +0200 +++ /var/tmp/diff_new_pack.gJqpfn/_new 2014-05-22 20:39:02.000000000 +0200 @@ -7,11 +7,11 @@ TagsCheck.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) -diff --git a/TagsCheck.py b/TagsCheck.py -index c6f5dda..712d4e0 100644 ---- a/TagsCheck.py -+++ b/TagsCheck.py -@@ -533,13 +533,20 @@ class TagsCheck(AbstractCheck.AbstractCheck): +Index: rpmlint-1.5/TagsCheck.py +=================================================================== +--- rpmlint-1.5.orig/TagsCheck.py ++++ rpmlint-1.5/TagsCheck.py +@@ -524,13 +524,20 @@ class TagsCheck(AbstractCheck.AbstractCh AbstractCheck.AbstractCheck.__init__(self, 'TagsCheck') def _unexpanded_macros(self, pkg, tagname, value, is_url=False): @@ -37,6 +37,3 @@ def check(self, pkg): --- -1.9.0 - ++++++ suse-changelog.patch ++++++ --- /var/tmp/diff_new_pack.gJqpfn/_old 2014-05-22 20:39:02.000000000 +0200 +++ /var/tmp/diff_new_pack.gJqpfn/_new 2014-05-22 20:39:02.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- TagsCheck.py.orig +++ TagsCheck.py -@@ -1025,8 +1025,8 @@ Development/''', +@@ -1032,8 +1032,8 @@ Development/''', "%s".''' % '", "'.join(VALID_GROUPS), 'no-changelogname-tag', ++++++ suse-python-abi-check.diff ++++++ --- /var/tmp/diff_new_pack.gJqpfn/_old 2014-05-22 20:39:02.000000000 +0200 +++ /var/tmp/diff_new_pack.gJqpfn/_new 2014-05-22 20:39:02.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- FilesCheck.py.orig +++ FilesCheck.py -@@ -1107,8 +1107,11 @@ class FilesCheck(AbstractCheck.AbstractC +@@ -1110,8 +1110,11 @@ class FilesCheck(AbstractCheck.AbstractC if res and not (pkg.check_versioned_dep('python-base', res.group(1)) or pkg.check_versioned_dep('python', ++++++ suse-whitelist-opensuse.diff ++++++ --- /var/tmp/diff_new_pack.gJqpfn/_old 2014-05-22 20:39:02.000000000 +0200 +++ /var/tmp/diff_new_pack.gJqpfn/_new 2014-05-22 20:39:02.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- TagsCheck.py.orig +++ TagsCheck.py -@@ -884,7 +884,7 @@ class TagsCheck(AbstractCheck.AbstractCh +@@ -891,7 +891,7 @@ class TagsCheck(AbstractCheck.AbstractCh spell_check(pkg, utf8summary, 'Summary(%s)', lang, ignored_words) if '\n' in summary: printError(pkg, 'summary-on-multiple-lines', lang) ++++++ xdg-check-exception.diff ++++++ --- /var/tmp/diff_new_pack.gJqpfn/_old 2014-05-22 20:39:02.000000000 +0200 +++ /var/tmp/diff_new_pack.gJqpfn/_new 2014-05-22 20:39:02.000000000 +0200 @@ -1,8 +1,8 @@ -diff --git a/MenuXDGCheck.py b/MenuXDGCheck.py -index 0996585..29085d5 100644 ---- a/MenuXDGCheck.py -+++ b/MenuXDGCheck.py -@@ -40,13 +40,16 @@ class MenuXDGCheck(AbstractCheck.AbstractFilesCheck): +Index: rpmlint-1.5/MenuXDGCheck.py +=================================================================== +--- rpmlint-1.5.orig/MenuXDGCheck.py ++++ rpmlint-1.5/MenuXDGCheck.py +@@ -43,13 +43,16 @@ class MenuXDGCheck(AbstractCheck.Abstrac printError(pkg, 'non-utf8-desktopfile', filename) self.cfp.read(f) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libsepol for openSUSE:Factory
by root＠hilbert.suse.de 22 May '14

22 May '14

Hello community, here is the log from the commit of package libsepol for openSUSE:Factory checked in at 2014-05-22 20:38:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libsepol (Old) and /work/SRC/openSUSE:Factory/.libsepol.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libsepol" Changes: -------- --- /work/SRC/openSUSE:Factory/libsepol/libsepol.changes 2013-11-07 14:44:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libsepol.new/libsepol.changes 2014-05-22 20:38:57.000000000 +0200 @@ -1,0 +2,11 @@ +Fri May 16 13:06:12 UTC 2014 - vcizek(a)suse.com + +- update to 2.3 + * Improve error message for name-based transition conflicts. + * Revert libsepol: filename_trans: use some better sorting to compare and merge. + * Report source file and line information for neverallow failures. + * Fix valgrind errors in constraint_expr_eval_reason from Richard Haines. + * Add sepol_validate_transition_reason_buffer function from Richard Haines. +- dropped libsepol-2.1.4-role_fix_callback.patch (upstream) + +------------------------------------------------------------------- Old: ---- libsepol-2.1.4-role_fix_callback.patch libsepol-2.2.tar.gz New: ---- libsepol-2.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsepol.spec ++++++ --- /var/tmp/diff_new_pack.g9Kg9n/_old 2014-05-22 20:38:58.000000000 +0200 +++ /var/tmp/diff_new_pack.g9Kg9n/_new 2014-05-22 20:38:58.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libsepol # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,14 @@ Name: libsepol -Version: 2.2 +Version: 2.3 Release: 0 Url: http://www.nsa.gov/selinux/ Summary: SELinux binary policy manipulation library License: LGPL-2.1+ Group: System/Libraries -Source: http://userspace.selinuxproject.org/releases/20131030/%{name}-%{version}.ta… +Source: http://userspace.selinuxproject.org/releases/20140506/%{name}-%{version}.ta… Source2: baselibs.conf -Patch: libsepol-2.1.4-role_fix_callback.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: pkg-config @@ -99,7 +98,6 @@ %prep %setup -q -%patch -p1 %build make %{?_smp_mflags} CC="%{__cc}" CFLAGS="$RPM_OPT_FLAGS $(getconf LFS_CFLAGS)" ++++++ libsepol-2.2.tar.gz -> libsepol-2.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsepol-2.2/ChangeLog new/libsepol-2.3/ChangeLog --- old/libsepol-2.2/ChangeLog 2013-10-30 17:51:19.000000000 +0100 +++ new/libsepol-2.3/ChangeLog 2014-05-06 19:30:27.000000000 +0200 @@ -1,3 +1,10 @@ +2.3 2014-05-06 + * Improve error message for name-based transition conflicts. + * Revert libsepol: filename_trans: use some better sorting to compare and merge. + * Report source file and line information for neverallow failures. + * Fix valgrind errors in constraint_expr_eval_reason from Richard Haines. + * Add sepol_validate_transition_reason_buffer function from Richard Haines. + 2.2 2013-10-30 * Allow constraint denial cause to be determined from Richard Haines. - Add kernel policy version 29. @@ -12,23 +19,23 @@ * implement default type policy syntax * Fix memory leak issues found by Klocwork -2.1.8 2011-09-13 +2.1.8 2012-09-13 * fix neverallow checking on attributes * Move context_copy() after switch block in ocontext_copy_*(). * check for missing initial SID labeling statement. * Add always_check_network policy capability * role_fix_callback skips out-of-scope roles during expansion. -2.1.7 2011-06-28 +2.1.7 2012-06-28 * reserve policycapability for redhat testing of ptrace child * cosmetic changes to make the source easier to read * prepend instead of append to filename_trans list * Android/MacOS X build support -2.1.6 2011-04-23 +2.1.6 2012-04-23 * allocate enough space to hold filename in trans rules -2.1.5 2011-03-28 +2.1.5 2012-03-28 * checkpolicy: implement new default labeling behaviors 2.1.4 2011-10-03 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsepol-2.2/VERSION new/libsepol-2.3/VERSION --- old/libsepol-2.2/VERSION 2013-10-30 17:51:19.000000000 +0100 +++ new/libsepol-2.3/VERSION 2014-05-06 19:30:27.000000000 +0200 @@ -1 +1 @@ -2.2 +2.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsepol-2.2/include/sepol/policydb/policydb.h new/libsepol-2.3/include/sepol/policydb/policydb.h --- old/libsepol-2.2/include/sepol/policydb/policydb.h 2013-10-30 17:51:19.000000000 +0100 +++ new/libsepol-2.3/include/sepol/policydb/policydb.h 2014-05-06 19:30:27.000000000 +0200 @@ -260,6 +260,9 @@ class_perm_node_t *perms; unsigned long line; /* line number from policy.conf where * this rule originated */ + /* source file name and line number (e.g. .te file) */ + char *source_filename; + unsigned long source_line; struct avrule *next; } avrule_t; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsepol-2.2/include/sepol/policydb/services.h new/libsepol-2.3/include/sepol/policydb/services.h --- old/libsepol-2.2/include/sepol/policydb/services.h 2013-10-30 17:51:19.000000000 +0100 +++ new/libsepol-2.3/include/sepol/policydb/services.h 2014-05-06 19:30:27.000000000 +0200 @@ -75,6 +75,20 @@ unsigned int *reason, char **reason_buf, unsigned int flags); + +/* + * Returns the mls/validatetrans constraint expression calculations in + * a buffer that must be free'd by the caller using free(3). + * If the SHOW_GRANTED flag is set it will show granted and denied + * mls/validatetrans (the default is to show only those denied). + */ +extern int sepol_validate_transition_reason_buffer(sepol_security_id_t oldsid, + sepol_security_id_t newsid, + sepol_security_id_t tasksid, + sepol_security_class_t tclass, + char **reason_buf, + unsigned int flags); + /* * Return a class ID associated with the class string representation * specified by `class_name'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsepol-2.2/src/assertion.c new/libsepol-2.3/src/assertion.c --- old/libsepol-2.2/src/assertion.c 2013-10-30 17:51:19.000000000 +0100 +++ new/libsepol-2.3/src/assertion.c 2014-05-06 19:30:27.000000000 +0200 @@ -31,13 +31,13 @@ policydb_t * p, avtab_t * te_avtab, avtab_t * te_cond_avtab, unsigned int stype, unsigned int ttype, - class_perm_node_t * perm, unsigned long line) + avrule_t * avrule) { avtab_key_t avkey; avtab_ptr_t node; class_perm_node_t *curperm; - for (curperm = perm; curperm != NULL; curperm = curperm->next) { + for (curperm = avrule->perms; curperm != NULL; curperm = curperm->next) { avkey.source_type = stype + 1; avkey.target_type = ttype + 1; avkey.target_class = curperm->class; @@ -59,9 +59,17 @@ return 0; err: - if (line) { + if (avrule->source_filename) { + ERR(handle, "neverallow on line %lu of %s (or line %lu of policy.conf) violated by allow %s %s:%s {%s };", + avrule->source_line, avrule->source_filename, avrule->line, + p->p_type_val_to_name[stype], + p->p_type_val_to_name[ttype], + p->p_class_val_to_name[curperm->class - 1], + sepol_av_to_string(p, curperm->class, + node->datum.data & curperm->data)); + } else if (avrule->line) { ERR(handle, "neverallow on line %lu violated by allow %s %s:%s {%s };", - line, p->p_type_val_to_name[stype], + avrule->line, p->p_type_val_to_name[stype], p->p_type_val_to_name[ttype], p->p_class_val_to_name[curperm->class - 1], sepol_av_to_string(p, curperm->class, @@ -121,7 +129,7 @@ if (a->flags & RULE_SELF) { if (check_assertion_helper (handle, p, &te_avtab, &te_cond_avtab, i, i, - a->perms, a->line)) { + a)) { rc = -1; goto out; } @@ -131,7 +139,7 @@ continue; if (check_assertion_helper (handle, p, &te_avtab, &te_cond_avtab, i, j, - a->perms, a->line)) { + a)) { rc = -1; goto out; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsepol-2.2/src/expand.c new/libsepol-2.3/src/expand.c --- old/libsepol-2.2/src/expand.c 2013-10-30 17:51:19.000000000 +0100 +++ new/libsepol-2.3/src/expand.c 2014-05-06 19:30:27.000000000 +0200 @@ -49,82 +49,6 @@ int expand_neverallow; } expand_state_t; -struct linear_probe { - filename_trans_t **table; /* filename_trans chunks with same stype */ - filename_trans_t **ends; /* pointers to ends of **table chunks */ - uint32_t length; /* length of the table */ -}; - -static int linear_probe_create(struct linear_probe *probe, uint32_t length) -{ - probe->table = calloc(length, sizeof(*probe->table)); - if (probe->table == NULL) - return -1; - - probe->ends = calloc(length, sizeof(*probe->ends)); - if (probe->ends == NULL) - return -1; - - probe->length = length; - - return 0; -} - -static void linear_probe_destroy(struct linear_probe *probe) -{ - if (probe->length == 0) - return; - - free(probe->table); - free(probe->ends); - memset(probe, 0, sizeof(*probe)); -} - -static void linear_probe_insert(struct linear_probe *probe, uint32_t key, - filename_trans_t *data) -{ - assert(probe->length > key); - - if (probe->table[key] != NULL) { - data->next = probe->table[key]; - probe->table[key] = data; - } else { - probe->table[key] = probe->ends[key] = data; - } -} - -static filename_trans_t *linear_probe_find(struct linear_probe *probe, uint32_t key) -{ - assert(probe->length > key); - - return probe->table[key]; -} - -/* Returns all chunks stored in the *probe as single-linked list */ -static filename_trans_t *linear_probe_dump(struct linear_probe *probe, - filename_trans_t **endp) -{ - uint32_t i; - filename_trans_t *result = NULL; - filename_trans_t *end = NULL; - - for (i = 0; i < probe->length; i++) { - if (probe->table[i] != NULL) { - if (end == NULL) - end = probe->ends[i]; - probe->ends[i]->next = result; - result = probe->table[i]; - probe->table[i] = probe->ends[i] = NULL; - } - } - - /* Incoherent result and end pointers indicates bug */ - assert((result != NULL && end != NULL) || (result == NULL && end == NULL)); - - *endp = end; - return result; -} - static void expand_state_init(expand_state_t * state) { memset(state, 0, sizeof(expand_state_t)); @@ -1459,20 +1383,10 @@ static int expand_filename_trans(expand_state_t *state, filename_trans_rule_t *rules) { unsigned int i, j; - filename_trans_t *new_trans, *cur_trans, *end; + filename_trans_t *new_trans, *cur_trans; filename_trans_rule_t *cur_rule; ebitmap_t stypes, ttypes; ebitmap_node_t *snode, *tnode; - struct linear_probe probe; - - /* - * Linear probing speeds-up finding filename_trans rules with certain - * "stype" value. - */ - if (linear_probe_create(&probe, 4096)) { /* Assume 4096 is enough for most cases */ - ERR(state->handle, "Out of memory!"); - return -1; - } cur_rule = rules; while (cur_rule) { @@ -1495,14 +1409,6 @@ mapped_otype = state->typemap[cur_rule->otype - 1]; - if (ebitmap_length(&stypes) > probe.length) { - linear_probe_destroy(&probe); - if (linear_probe_create(&probe, ebitmap_length(&stypes))) { - ERR(state->handle, "Out of memory!"); - return -1; - } - } - ebitmap_for_each_bit(&stypes, snode, i) { if (!ebitmap_node_get_bit(snode, i)) continue; @@ -1510,19 +1416,21 @@ if (!ebitmap_node_get_bit(tnode, j)) continue; - cur_trans = linear_probe_find(&probe, i); - while (cur_trans != NULL) { - if ((cur_trans->ttype == j + 1) && + cur_trans = state->out->filename_trans; + while (cur_trans) { + if ((cur_trans->stype == i + 1) && + (cur_trans->ttype == j + 1) && (cur_trans->tclass == cur_rule->tclass) && (!strcmp(cur_trans->name, cur_rule->name))) { /* duplicate rule, who cares */ if (cur_trans->otype == mapped_otype) break; - ERR(state->handle, "Conflicting filename trans rules %s %s %s : %s otype1:%s otype2:%s", - cur_trans->name, + + ERR(state->handle, "Conflicting name-based type_transition %s %s:%s \"%s\": %s vs %s", state->out->p_type_val_to_name[i], state->out->p_type_val_to_name[j], state->out->p_class_val_to_name[cur_trans->tclass - 1], + cur_trans->name, state->out->p_type_val_to_name[cur_trans->otype - 1], state->out->p_type_val_to_name[mapped_otype - 1]); @@ -1540,6 +1448,8 @@ return -1; } memset(new_trans, 0, sizeof(*new_trans)); + new_trans->next = state->out->filename_trans; + state->out->filename_trans = new_trans; new_trans->name = strdup(cur_rule->name); if (!new_trans->name) { @@ -1550,16 +1460,9 @@ new_trans->ttype = j + 1; new_trans->tclass = cur_rule->tclass; new_trans->otype = mapped_otype; - linear_probe_insert(&probe, i, new_trans); } } - cur_trans = linear_probe_dump(&probe, &end); - if (cur_trans != NULL) { - end->next = state->out->filename_trans; - state->out->filename_trans = cur_trans; - } - ebitmap_destroy(&stypes); ebitmap_destroy(&ttypes); @@ -2650,6 +2553,12 @@ avrule->specified = AVRULE_NEVERALLOW; avrule->line = source_rule->line; avrule->flags = source_rule->flags; + avrule->source_line = source_rule->source_line; + if (source_rule->source_filename) { + avrule->source_filename = strdup(source_rule->source_filename); + if (!avrule->source_filename) + goto err; + } if (ebitmap_cpy(&avrule->stypes.types, &stypes)) goto err; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsepol-2.2/src/link.c new/libsepol-2.3/src/link.c --- old/libsepol-2.2/src/link.c 2013-10-30 17:51:19.000000000 +0100 +++ new/libsepol-2.3/src/link.c 2014-05-06 19:30:27.000000000 +0200 @@ -1325,6 +1325,12 @@ cur_perm = cur_perm->next; } new_rule->line = cur->line; + new_rule->source_line = cur->source_line; + if (cur->source_filename) { + new_rule->source_filename = strdup(cur->source_filename); + if (!new_rule->source_filename) + goto cleanup; + } cur = cur->next; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsepol-2.2/src/policydb.c new/libsepol-2.3/src/policydb.c --- old/libsepol-2.2/src/policydb.c 2013-10-30 17:51:19.000000000 +0100 +++ new/libsepol-2.3/src/policydb.c 2014-05-06 19:30:27.000000000 +0200 @@ -535,6 +535,8 @@ type_set_destroy(&x->stypes); type_set_destroy(&x->ttypes); + free(x->source_filename); + next = x->perms; while (next) { cur = next; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsepol-2.2/src/services.c new/libsepol-2.3/src/services.c --- old/libsepol-2.2/src/services.c 2013-10-30 17:51:19.000000000 +0100 +++ new/libsepol-2.3/src/services.c 2014-05-06 19:30:27.000000000 +0200 @@ -344,11 +344,16 @@ if (len < 0 || len >= class_buf_len - buf_used) continue; - /* Add permission entries */ + /* Add permission entries (validatetrans does not have perms) */ p += len; buf_used += len; - len = snprintf(p, class_buf_len - buf_used, "{%s } (", - sepol_av_to_string(policydb, tclass, constraint->permissions)); + if (state_num < 2) { + len = snprintf(p, class_buf_len - buf_used, "{%s } (", + sepol_av_to_string(policydb, tclass, + constraint->permissions)); + } else { + len = snprintf(p, class_buf_len - buf_used, "("); + } if (len < 0 || len >= class_buf_len - buf_used) continue; break; @@ -723,6 +728,7 @@ push(answer_list[answer_counter++]); free(a); free(b); + free(expr_list[x]); } else if (strncmp(expr_list[x], "not", 3) == 0) { b = pop(); b_len = strlen(b); @@ -743,6 +749,7 @@ expr_list[x], b); push(answer_list[answer_counter++]); free(b); + free(expr_list[x]); } else { push(expr_list[x]); } @@ -750,8 +757,11 @@ /* Get the final answer from tos and build constraint text */ a = pop(); - /* Constraint calculation: rc = 0 is denied, rc = 1 is granted */ - sprintf(tmp_buf, "Constraint %s\n", s[0] ? "GRANTED" : "DENIED"); + /* validatetrans / constraint calculation: + rc = 0 is denied, rc = 1 is granted */ + sprintf(tmp_buf, "%s %s\n", + xcontext ? "Validatetrans" : "Constraint", + s[0] ? "GRANTED" : "DENIED"); int len, new_buf_len; char *p, **new_buf = r_buf; @@ -807,6 +817,8 @@ for (x = 0; expr_list[x] != NULL; x++) free(expr_list[x]); } + free(answer_list); + free(expr_list); return rc; } @@ -982,6 +994,68 @@ return 0; } +/* + * sepol_validate_transition_reason_buffer - the reason buffer is realloc'd + * in the constraint_expr_eval_reason() function. + */ +int hidden sepol_validate_transition_reason_buffer(sepol_security_id_t oldsid, + sepol_security_id_t newsid, + sepol_security_id_t tasksid, + sepol_security_class_t tclass, + char **reason_buf, + unsigned int flags) +{ + context_struct_t *ocontext; + context_struct_t *ncontext; + context_struct_t *tcontext; + class_datum_t *tclass_datum; + constraint_node_t *constraint; + + if (!tclass || tclass > policydb->p_classes.nprim) { + ERR(NULL, "unrecognized class %d", tclass); + return -EINVAL; + } + tclass_datum = policydb->class_val_to_struct[tclass - 1]; + + ocontext = sepol_sidtab_search(sidtab, oldsid); + if (!ocontext) { + ERR(NULL, "unrecognized SID %d", oldsid); + return -EINVAL; + } + + ncontext = sepol_sidtab_search(sidtab, newsid); + if (!ncontext) { + ERR(NULL, "unrecognized SID %d", newsid); + return -EINVAL; + } + + tcontext = sepol_sidtab_search(sidtab, tasksid); + if (!tcontext) { + ERR(NULL, "unrecognized SID %d", tasksid); + return -EINVAL; + } + + /* + * Set the buffer to NULL as mls/validatetrans may not be processed. + * If a buffer is required, then the routines in + * constraint_expr_eval_reason will realloc in REASON_BUF_SIZE + * chunks (as it gets called for each mls/validatetrans processed). + * We just make sure these start from zero. + */ + *reason_buf = NULL; + reason_buf_used = 0; + reason_buf_len = 0; + constraint = tclass_datum->validatetrans; + while (constraint) { + if (!constraint_expr_eval_reason(ocontext, ncontext, tcontext, + tclass, constraint, reason_buf, flags)) { + return -EPERM; + } + constraint = constraint->next; + } + return 0; +} + int hidden sepol_compute_av_reason(sepol_security_id_t ssid, sepol_security_id_t tsid, sepol_security_class_t tclass, -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libsemanage for openSUSE:Factory
by root＠hilbert.suse.de 22 May '14

22 May '14

Hello community, here is the log from the commit of package libsemanage for openSUSE:Factory checked in at 2014-05-22 20:38:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libsemanage (Old) and /work/SRC/openSUSE:Factory/.libsemanage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libsemanage" Changes: -------- --- /work/SRC/openSUSE:Factory/libsemanage/libsemanage.changes 2014-02-13 06:51:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libsemanage.new/libsemanage.changes 2014-05-22 20:38:55.000000000 +0200 @@ -1,0 +2,6 @@ +Sun May 18 00:10:55 UTC 2014 - crrodriguez(a)opensuse.org + +- version 2.3 +* Fix memory leak in semanage_genhomedircon from Thomas Hurd. + +------------------------------------------------------------------- Old: ---- libsemanage-2.2.tar.gz New: ---- libsemanage-2.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsemanage.spec ++++++ --- /var/tmp/diff_new_pack.xrMEMt/_old 2014-05-22 20:38:57.000000000 +0200 +++ /var/tmp/diff_new_pack.xrMEMt/_new 2014-05-22 20:38:57.000000000 +0200 @@ -26,13 +26,13 @@ BuildRequires: libustr-devel Name: libsemanage -Version: 2.2 +Version: 2.3 Release: 0 Summary: SELinux binary policy manipulation library License: LGPL-2.1+ Group: System/Libraries Url: http://userspace.selinuxproject.org/ -Source: http://userspace.selinuxproject.org/releases/20131030/%{name}-%{version}.ta… +Source: http://userspace.selinuxproject.org/releases/20140506/%{name}-%{version}.ta… Source1: baselibs.conf Source2: semanage.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ python-semanage.spec ++++++ --- /var/tmp/diff_new_pack.xrMEMt/_old 2014-05-22 20:38:57.000000000 +0200 +++ /var/tmp/diff_new_pack.xrMEMt/_new 2014-05-22 20:38:57.000000000 +0200 @@ -27,13 +27,13 @@ BuildRequires: swig Name: python-semanage -Version: 2.2 +Version: 2.3 Release: 0 Summary: Python bindings for libsemanage License: LGPL-2.1 Group: Development/Languages/Python Url: http://www.nsa.gov/selinux/ -Source: http://userspace.selinuxproject.org/releases/20131030/libsemanage-%{version… +Source: http://userspace.selinuxproject.org/releases/20140506/libsemanage-%{version… Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: libsemanage1 = %{version} ++++++ libsemanage-2.2.tar.gz -> libsemanage-2.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsemanage-2.2/ChangeLog new/libsemanage-2.3/ChangeLog --- old/libsemanage-2.2/ChangeLog 2013-10-30 17:51:19.000000000 +0100 +++ new/libsemanage-2.3/ChangeLog 2014-05-06 19:30:27.000000000 +0200 @@ -1,3 +1,6 @@ +2.3 2014-05-06 + * Fix memory leak in semanage_genhomedircon from Thomas Hurd. + 2.2 2013-10-30 * Avoid duplicate list entries from Dan Walsh. * Add audit support to libsemanage from Dan Walsh. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsemanage-2.2/VERSION new/libsemanage-2.3/VERSION --- old/libsemanage-2.2/VERSION 2013-10-30 17:51:19.000000000 +0100 +++ new/libsemanage-2.3/VERSION 2014-05-06 19:30:27.000000000 +0200 @@ -1 +1 @@ -2.2 +2.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsemanage-2.2/src/genhomedircon.c new/libsemanage-2.3/src/genhomedircon.c --- old/libsemanage-2.2/src/genhomedircon.c 2013-10-30 17:51:19.000000000 +0100 +++ new/libsemanage-2.3/src/genhomedircon.c 2014-05-06 19:30:27.000000000 +0200 @@ -1070,8 +1070,10 @@ s.fallback_user = strdup(FALLBACK_USER); s.fallback_user_prefix = strdup(FALLBACK_USER_PREFIX); s.fallback_user_level = strdup(FALLBACK_USER_LEVEL); - if (s.fallback_user == NULL || s.fallback_user_prefix == NULL || s.fallback_user_level == NULL) - return STATUS_ERR; + if (s.fallback_user == NULL || s.fallback_user_prefix == NULL || s.fallback_user_level == NULL) { + retval = STATUS_ERR; + goto done; + } if (ignoredirs) ignore_setup(ignoredirs); @@ -1082,15 +1084,19 @@ if (!(out = fopen(s.fcfilepath, "w"))) { /* couldn't open output file */ ERR(sh, "Could not open the file_context file for writing"); - return STATUS_ERR; + retval = STATUS_ERR; + goto done; } retval = write_context_file(&s, out); - fclose(out); +done: + if (out != NULL) + fclose(out); free(s.fallback_user); free(s.fallback_user_prefix); + free(s.fallback_user_level); ignore_free(); return retval; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libselinux for openSUSE:Factory
by root＠hilbert.suse.de 22 May '14

22 May '14

Hello community, here is the log from the commit of package libselinux for openSUSE:Factory checked in at 2014-05-22 20:38:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libselinux (Old) and /work/SRC/openSUSE:Factory/.libselinux.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libselinux" Changes: -------- --- /work/SRC/openSUSE:Factory/libselinux/libselinux.changes 2013-11-07 17:37:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libselinux.new/libselinux.changes 2014-05-22 20:38:53.000000000 +0200 @@ -1,0 +2,7 @@ +Sun May 18 00:15:17 UTC 2014 - crrodriguez(a)opensuse.org + +- Update to version 2.3 +* Get rid of security_context_t and fix const declarations. +* Refactor rpm_execcon() into a new setexecfilecon() from Guillem Jover. + +------------------------------------------------------------------- Old: ---- libselinux-2.2.tar.gz New: ---- libselinux-2.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libselinux-bindings.spec ++++++ --- /var/tmp/diff_new_pack.xQP0yF/_old 2014-05-22 20:38:55.000000000 +0200 +++ /var/tmp/diff_new_pack.xQP0yF/_new 2014-05-22 20:38:55.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libselinux-bindings # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,10 +16,10 @@ # -%define libsepol_ver 2.2 +%define libsepol_ver 2.3 Name: libselinux-bindings -Version: 2.2 +Version: 2.3 Release: 0 Url: http://userspace.selinuxproject.org/ Summary: SELinux library and simple utilities @@ -27,7 +27,7 @@ Group: System/Libraries # embedded is the MD5 -Source: http://userspace.selinuxproject.org/releases/20131030/libselinux-%{version}… +Source: http://userspace.selinuxproject.org/releases/20140506/libselinux-%{version}… Source1: selinux-ready Source2: baselibs.conf Patch1: libselinux-2.2-ruby.patch ++++++ libselinux.spec ++++++ --- /var/tmp/diff_new_pack.xQP0yF/_old 2014-05-22 20:38:55.000000000 +0200 +++ /var/tmp/diff_new_pack.xQP0yF/_new 2014-05-22 20:38:55.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libselinux # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,17 +16,17 @@ # -%define libsepol_ver 2.2 +%define libsepol_ver 2.3 Name: libselinux -Version: 2.2 +Version: 2.3 Release: 0 Url: http://userspace.selinuxproject.org/ Summary: SELinux library and simple utilities License: GPL-2.0 and SUSE-Public-Domain Group: System/Libraries -Source: http://userspace.selinuxproject.org/releases/20131030/%{name}-%{version}.ta… +Source: http://userspace.selinuxproject.org/releases/20140506/%{name}-%{version}.ta… Source1: selinux-ready Source2: baselibs.conf Patch1: %{name}-2.2-ruby.patch ++++++ libselinux-2.2.tar.gz -> libselinux-2.3.tar.gz ++++++ ++++ 2753 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libunwind for openSUSE:Factory
by root＠hilbert.suse.de 22 May '14

22 May '14

Hello community, here is the log from the commit of package libunwind for openSUSE:Factory checked in at 2014-05-22 20:38:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libunwind (Old) and /work/SRC/openSUSE:Factory/.libunwind.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libunwind" Changes: -------- --- /work/SRC/openSUSE:Factory/libunwind/libunwind.changes 2013-12-22 19:36:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libunwind.new/libunwind.changes 2014-05-22 20:38:52.000000000 +0200 @@ -1,0 +2,7 @@ +Mon May 19 12:26:43 UTC 2014 - tchvatal(a)suse.com + +- Clean up with spec-cleaner +- Add dependency over libatomic_opts that was missing +- Do not disable fortify-sources as it seems to work with it anyway + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libunwind.spec ++++++ --- /var/tmp/diff_new_pack.hQCACX/_old 2014-05-22 20:38:53.000000000 +0200 +++ /var/tmp/diff_new_pack.hQCACX/_new 2014-05-22 20:38:53.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libunwind # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,12 @@ Name: libunwind -BuildRequires: gcc-c++ -BuildRequires: libtool -BuildRequires: pkg-config -Url: http://savannah.nongnu.org/projects/libunwind/ +Version: 1.1 +Release: 0 Summary: Unwind Library License: MIT Group: System/Base -Version: 1.1 -Release: 0 +Url: http://savannah.nongnu.org/projects/libunwind/ Source: libunwind-%{version}.tar.gz Patch0: libunwind-1.1-tests.diff #PATCH-FIX-UPSTREAM: upstream commit ae3dd9417a3d178cf51ce744d85b695dbf025b44 @@ -34,19 +31,19 @@ Patch2: libunwind-aarch64.patch # PATCH-FIX-UPSTREAM: uweigand(a)de.ibm.com -- submitted to libunwind-devel Patch3: libunwind-ppc64le.patch +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: gcc-c++ +BuildRequires: libatomic_ops-devel +BuildRequires: libtool +BuildRequires: pkg-config BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: %ix86 ia64 x86_64 %arm ppc ppc64 ppc64le aarch64 +ExclusiveArch: %ix86 ia64 x86_64 %{arm} ppc ppc64 ppc64le aarch64 %description A portable and efficient C programming interface (API) to determine the call chain of a program. - - -Authors: --------- - David Mosberger <David.Mosberger(a)acm.org> - %package devel Summary: Unwind library Group: Development/Libraries/C and C++ @@ -57,12 +54,6 @@ A portable and efficient C programming interface (API) to determine the call-chain of a program. - - -Authors: --------- - David Mosberger <davidm(a)hpl.hp.com> - %prep %setup -q %patch0 -p1 @@ -71,25 +62,23 @@ %patch3 -p1 %build -autoreconf -fi -export CFLAGS="%optflags -U_FORTIFY_SOURCE" +autoreconf -fvi %configure make %{?_smp_mflags} %check %if ! 0%{?qemu_user_space_build:1} -# There are some expected failures -make -k check || : +make check %{?_smp_mflags} || : %endif %install -make install DESTDIR=$RPM_BUILD_ROOT -rm -f "%buildroot/%_libdir"/*.la -mkdir -p $RPM_BUILD_ROOT/%{_lib} -mv $RPM_BUILD_ROOT%{_libdir}/libunwind.so.8* $RPM_BUILD_ROOT/%{_lib} -ln -sf /%{_lib}/libunwind.so.8 $RPM_BUILD_ROOT%{_libdir}/libunwind.so +make DESTDIR=%{buildroot} install %{?_smp_mflags} +find %{buildroot} -type f -name "*.la" -delete -print +mkdir -p %{buildroot}/%{_lib} +mv %{buildroot}%{_libdir}/libunwind.so.8* %{buildroot}/%{_lib} +ln -sf /%{_lib}/libunwind.so.8 %{buildroot}%{_libdir}/libunwind.so # Check that ln did not create a dangling link -stat "%buildroot"/$(readlink -f "%buildroot/%_libdir/libunwind.so"); +stat %{buildroot}/$(readlink -f "%{buildroot}/%{_libdir}/libunwind.so"); %post -p /sbin/ldconfig @@ -97,20 +86,20 @@ %files %defattr(-, root, root) -/%_lib/lib* +/%{_lib}/lib* %{_libdir}/lib*.so.* %{_libdir}/libunwind.so %files devel %defattr(-, root, root) -%{_prefix}/include/* +%{_includedir}/* %{_libdir}/lib*.a %{_libdir}/libunwind-*.so %{_libdir}/pkgconfig/libunwind-generic.pc %{_libdir}/pkgconfig/libunwind-ptrace.pc %{_libdir}/pkgconfig/libunwind-setjmp.pc %{_libdir}/pkgconfig/libunwind.pc -%ifarch %arm %ix86 x86_64 aarch64 +%ifarch %{arm} %ix86 x86_64 aarch64 %{_libdir}/pkgconfig/libunwind-coredump.pc %endif %doc %{_mandir}/man?/* -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit resource-agents for openSUSE:Factory
by root＠hilbert.suse.de 22 May '14

22 May '14

Hello community, here is the log from the commit of package resource-agents for openSUSE:Factory checked in at 2014-05-22 20:38:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/resource-agents (Old) and /work/SRC/openSUSE:Factory/.resource-agents.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "resource-agents" Changes: -------- --- /work/SRC/openSUSE:Factory/resource-agents/resource-agents.changes 2014-04-08 22:37:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.resource-agents.new/resource-agents.changes 2014-05-22 20:38:50.000000000 +0200 @@ -1,0 +2,31 @@ +Mon May 19 11:05:11 UTC 2014 - kgronlund(a)suse.com + +- rgmanager/fs: typo preventing passing some mount opts +- nfsserver.sh: add an optional option for the rpc.statd listening port +- iscsi: iscsi status fails with open-iscsi with support for flash (bnc#878039) +- nfsserver: let systemd service files handle lock notifications +- vm.sh: Monitor kvm resources without requiring libvirtd +- Calculate stop loop according stop timeout +- Added kamailio resource agent +- IPaddr2: fix error msg from manual clone/incarnation # era +- clvm: Properly detect directory for vg tools +- Add IPv6 http(s) health checking to ldirectord +- nfsserver.sh: On stop, kill sm-notify so /var/lib/nfs/statd can be unmounted +- VirtualDomain: Allow monitoring of lxc domains without libvirtd +- named.sh: Fix issues running named daemon as a non-root user +- VirtualDomain: cache domain emulator after start +- CTDB: do not fail monitor operation when ctdb socket does not exist +- exportfs: Make unlock_on_stop_default=1 (bnc#864263) +- Stateful: Clean up implementation of Stateful (bnc#867372) +- dnsupdate: resource agent for IP take-over via dynamic DNS +- upstream cs: v3.9.5-404-g61a2ccc8b7b1 + +- Updated resource-agents-nfsserver-sle11.patch +- Removed 0015-Medium-exportfs-Make-unlock_on_stop_default-1-bnc-86.patch + +------------------------------------------------------------------- +Thu May 8 11:28:32 CEST 2014 - ro(a)suse.de + +- use _rundir macro + +------------------------------------------------------------------- Old: ---- resource-agents-3.9.5+git335.tar.xz New: ---- resource-agents-3.9.5+git404.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ resource-agents.spec ++++++ --- /var/tmp/diff_new_pack.pXIXiN/_old 2014-05-22 20:38:51.000000000 +0200 +++ /var/tmp/diff_new_pack.pXIXiN/_new 2014-05-22 20:38:51.000000000 +0200 @@ -36,11 +36,15 @@ %define SSLeay perl-Net_SSLeay %endif +%if ! %{defined _rundir} +%define _rundir %{_localstatedir}/run +%endif + Name: resource-agents Summary: Open Source HA Reusable Cluster Resource Scripts License: GPL-2.0 and LGPL-2.1+ Group: Productivity/Clustering/HA -Version: 3.9.5+git335 +Version: 3.9.5+git404 Release: 0 Url: http://linux-ha.org/ Source: resource-agents-%{version}.tar.xz @@ -63,8 +67,6 @@ Patch13: 0001-Low-ldirectord-fix-the-list-output-to-include-ops-fl.patch # PATCH-FEATURE-UPSTREAM: ldirectord: Add systemd unit file (bnc#863250) Patch14: 0001-ldirectord-Add-systemd-unit-file-bnc-863250.patch -# PATCH-FIX-UPSTREAM: exportfs: make unlock_on_stop default to 1 (bnc#864263) -Patch15: 0015-Medium-exportfs-Make-unlock_on_stop_default-1-bnc-86.patch # PATCH-FIX-UPSTREAM: mysql: Update mysql with more sensible defaults (bnc#863844) Patch16: 0001-Medium-mysql-Update-mysql-with-more-sensible-default.patch # PATCH-FIX-UPSTREAM: sg_persist: fix commented by Lars @@ -148,7 +150,6 @@ %patch12 -p1 %patch13 -p1 %patch14 -p1 -%patch15 -p1 %patch16 -p1 %patch17 -p1 ########################################################### @@ -160,7 +161,8 @@ CONF_OPTS="--with-ras-set=linux-ha \ --enable-fatal-warnings=yes \ --with-systemdsystemunitdir=%{_unitdir} \ - --with-pkg-name=%{name}" + --with-pkg-name=%{name} \ + --with-rsctmpdir=%{_rundir}/%{name}" %else CONF_OPTS="--with-ras-set=linux-ha \ --enable-fatal-warnings=yes \ @@ -227,7 +229,7 @@ rm -rf $RPM_BUILD_DIR/resource-agents ########################################################### %post -test -d /var/run/resource-agents || mkdir -m 1755 /var/run/resource-agents +test -d %{_rundir}/resource-agents || mkdir -m 1755 %{_rundir}/resource-agents %if 0%{?suse_version} @@ -286,7 +288,7 @@ %{_sbindir}/sfex_init %{_sbindir}/sfex_stat %{_includedir}/heartbeat -%ghost %dir %attr (1755, root, root) %{_var}/run/resource-agents +%ghost %dir %attr (1755, root, root) %{_rundir}/resource-agents %doc AUTHORS %doc COPYING %doc COPYING.GPLv3 ++++++ resource-agents-3.9.5+git335.tar.xz -> resource-agents-3.9.5+git404.tar.xz ++++++ ++++ 2845 lines of diff (skipped) ++++++ resource-agents-nfsserver-sle11.patch ++++++ --- /var/tmp/diff_new_pack.pXIXiN/_old 2014-05-22 20:38:52.000000000 +0200 +++ /var/tmp/diff_new_pack.pXIXiN/_new 2014-05-22 20:38:52.000000000 +0200 @@ -1,10 +1,16 @@ +commit 9538d4622b54c2c5693baff32bb12ba399dbfd39 +Author: Kristoffer Grönlund <krig(a)koru.se> +Date: Mon May 19 13:21:50 2014 +0200 + + nfsserver: fix path to sm-notify + diff --git a/heartbeat/nfsserver b/heartbeat/nfsserver -index ff2e3ca..7ec62bf 100755 +index c8a44795daaf..ce6e6bb3075c 100755 --- a/heartbeat/nfsserver +++ b/heartbeat/nfsserver -@@ -14,7 +14,7 @@ fi +@@ -19,7 +19,7 @@ if ! [ -f $DEFAULT_INIT_SCRIPT ]; then + fi - DEFAULT_INIT_SCRIPT="/etc/init.d/nfsserver" DEFAULT_NOTIFY_CMD=`which sm-notify` -DEFAULT_NOTIFY_CMD=${DEFAULT_NOTIFY_CMD:-"/sbin/sm-notify"} +DEFAULT_NOTIFY_CMD=${DEFAULT_NOTIFY_CMD:-"/usr/sbin/sm-notify"} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit systemtap for openSUSE:Factory
by root＠hilbert.suse.de 22 May '14

22 May '14

Hello community, here is the log from the commit of package systemtap for openSUSE:Factory checked in at 2014-05-22 20:38:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemtap (Old) and /work/SRC/openSUSE:Factory/.systemtap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "systemtap" Changes: -------- --- /work/SRC/openSUSE:Factory/systemtap/systemtap.changes 2014-05-06 14:03:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.systemtap.new/systemtap.changes 2014-05-22 20:38:48.000000000 +0200 @@ -1,0 +2,5 @@ +Sat May 17 19:34:40 UTC 2014 - coolo(a)suse.com + +- use %_rundir if available + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemtap.spec ++++++ --- /var/tmp/diff_new_pack.ctilnD/_old 2014-05-22 20:38:49.000000000 +0200 +++ /var/tmp/diff_new_pack.ctilnD/_new 2014-05-22 20:38:49.000000000 +0200 @@ -42,6 +42,10 @@ Requires: libebl1 BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if ! %{defined _rundir} +%define _rundir %{_localstatedir}/run +%endif + %description SystemTap is an instrumentation system for systems running Linux. Developers can write instrumentation to collect data on the operation @@ -154,7 +158,7 @@ %{_libexecdir}/%{name}/stap-stop-server %{_mandir}/man8/stap-server.8* %ghost %{_localstatedir}/log/stap-server.log -%ghost %dir %{_localstatedir}/run/stap-server +%ghost %dir %{_rundir}/stap-server %files sdt-devel %defattr(-,root,root) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit net-snmp for openSUSE:Factory
by root＠hilbert.suse.de 22 May '14

22 May '14

Hello community, here is the log from the commit of package net-snmp for openSUSE:Factory checked in at 2014-05-22 20:38:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/net-snmp (Old) and /work/SRC/openSUSE:Factory/.net-snmp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "net-snmp" Changes: -------- --- /work/SRC/openSUSE:Factory/net-snmp/net-snmp.changes 2014-02-26 23:20:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.net-snmp.new/net-snmp.changes 2014-05-22 20:38:44.000000000 +0200 @@ -1,0 +2,24 @@ +Sat May 17 18:57:58 UTC 2014 - coolo(a)suse.de + +- recompress .tar.gz - it has trailing garbage, hope we can readd + source url on next update + +------------------------------------------------------------------- +Fri May 16 12:25:59 UTC 2014 - lchiquitto(a)suse.com + +- update to upstream version 5.7.2.1, fixing one security issue: + * A denial of service attack vector was discovered on the Linux + implementation of the ICMP-MIB. (CVE-2014-2284, bnc#866942) + +------------------------------------------------------------------- +Wed May 14 22:06:00 CEST 2014 - lchiquitto(a)suse.com + +- net-snmp-5.7.2-fix-mib-representation-of-timeout-values.patch: + fix mib representation of timeout values (bnc#833153) + +------------------------------------------------------------------- +Thu May 8 11:47:01 CEST 2014 - ro(a)suse.de + +- use _rundir macro + +------------------------------------------------------------------- Old: ---- net-snmp-5.7.2.tar.gz New: ---- net-snmp-5.7.2-fix-mib-representation-of-timeout-values.patch net-snmp-5.7.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ net-snmp.spec ++++++ --- /var/tmp/diff_new_pack.40LqAy/_old 2014-05-22 20:38:47.000000000 +0200 +++ /var/tmp/diff_new_pack.40LqAy/_new 2014-05-22 20:38:47.000000000 +0200 @@ -26,11 +26,14 @@ %endif %define netsnmp_check 1 %define netsnmp_logfile /var/log/net-snmpd.log -%define netsnmp_agentx_socket_dir_fhs /var/run/agentx +%if ! %{defined _rundir} +%define _rundir %{_localstatedir}/run +%endif +%define netsnmp_agentx_socket_dir_fhs %{_rundir}/agentx %define netsnmp_agentx_socket_dir_rfc /var/agentx Name: net-snmp -Version: 5.7.2 +Version: 5.7.2.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: openssl-devel @@ -46,7 +49,8 @@ Requires: perl-TermReadKey PreReq: %insserv_prereq %fillup_prereq /sbin/chkconfig Url: http://sourceforge.net/projects/net-snmp -Source: http://sourceforge.net/projects/net-snmp/files/net-snmp/%{version}/%{pkg_na… +#Source: http://sourceforge.net/projects/net-snmp/files/net-snmp/%{version}/%{pkg_na… +Source: %{pkg_name}-%{version}.tar.gz Source1: rc.snmpd Source2: snmpd.conf Source3: README.SUSE @@ -63,7 +67,8 @@ Patch6: net-snmp-5.7.2-perl-tk-warning.patch Patch7: net-snmp-5.7.2-velocity-mib.patch Patch8: net-snmp-5.7.2-build-fix-for-strlcat.patch -Patch23: net-snmp-5.7.2-fix-snmpd-crashing-when-an-agentx-disconnects.patch +Patch9: net-snmp-5.7.2-fix-snmpd-crashing-when-an-agentx-disconnects.patch +Patch10: net-snmp-5.7.2-fix-mib-representation-of-timeout-values.patch # Summary: SNMP Daemon License: BSD-3-Clause and MIT @@ -86,10 +91,6 @@ to net-snmp in November 2000. -Authors: --------- - Wes Hardaker <hardaker(a)users.sourceforge.net> - %define library_name libsnmp30 %package -n libsnmp30 @@ -114,11 +115,6 @@ This package holds the shared libraries from the net-snmp package. - -Authors: --------- - Wes Hardaker <hardaker(a)users.sourceforge.net> - %package devel Requires: %{library_name} = %{version} # for mib2c @@ -152,10 +148,6 @@ from the net-snmp package. -Authors: --------- - Wes Hardaker <hardaker(a)users.sourceforge.net> - %package -n snmp-mibs # Summary: MIB files from net-snmp @@ -177,10 +169,6 @@ This package holds the MIB files from the net-snmp package. -Authors: --------- - Wes Hardaker <hardaker(a)users.sourceforge.net> - %package -n perl-SNMP Requires: %{pkg_name} = %{version} Requires: perl-base = %{perl_version} @@ -193,10 +181,6 @@ The Perl5 'SNMP' Extension Module v3.1.0 for the UCD SNMPv3 library. -Authors: --------- - G.S. Marzot <gmarzot(a)nortelnetworks.com> - %package python Summary: The Python 'netsnmp' module for the Net-SNMP License: BSD-3-Clause and MIT @@ -208,11 +192,6 @@ Net-SNMP toolkit library. -Authors: --------- - G.S. Marzot <gmarzot(a)nortelnetworks.com> - - %prep %setup -q -n %{pkg_name}-%{version} %patch1 -p1 @@ -222,7 +201,8 @@ %patch6 -p1 %patch7 -p1 %patch8 -p1 -%patch23 -p1 +%patch9 -p1 +%patch10 -p1 %build MIBS="misc/ipfwacc ucd-snmp/diskio etherlike-mib rmon-mib velocity smux \ ++++++ net-snmp-5.7.2-fix-mib-representation-of-timeout-values.patch ++++++ commit 78dac6e37943d1ad99841898806ea60b0eede636 Author: Wes Hardaker <hardaker(a)users.sourceforge.net> Date: Mon Jul 22 12:39:00 2013 -0700 fix bug number #a2478: fix mib representation of timeout values commit 390303059fbd98b1ee7621ddd4ad4c11d100fff9 Author: Magnus Fromreide <magfr(a)lysator.liu.se> Date: Sun Jul 28 21:28:14 2013 +0200 Revert 78dac6e37943d1ad99841898806ea60b0eede636 and resolve a2478 in a way that avoids truncating snmpTargetAddrTimeout. commit 96302af7fc3108c208227432f0f0b75f3e7b906d Author: Magnus Fromreide <magfr(a)lysator.liu.se> Date: Wed Aug 28 10:59:05 2013 +0200 Correct conversion factor from microseconds to centiseconds. Index: net-snmp-5.7.2/agent/mibgroup/target/snmpTargetAddrEntry.h =================================================================== --- net-snmp-5.7.2.orig/agent/mibgroup/target/snmpTargetAddrEntry.h +++ net-snmp-5.7.2/agent/mibgroup/target/snmpTargetAddrEntry.h @@ -51,7 +51,7 @@ config_add_mib(SNMPv2-TM) int tDomainLen; unsigned char *tAddress; size_t tAddressLen; - int timeout; + int timeout; /* Timeout in centiseconds */ int retryCount; char *tagList; char *params; Index: net-snmp-5.7.2/agent/mibgroup/target/target.c =================================================================== --- net-snmp-5.7.2.orig/agent/mibgroup/target/target.c +++ net-snmp-5.7.2/agent/mibgroup/target/target.c @@ -240,7 +240,7 @@ get_target_sessions(char *taglist, Targe } #endif memset(&thissess, 0, sizeof(thissess)); - thissess.timeout = (targaddrs->timeout) * 1000; + thissess.timeout = (targaddrs->timeout) * 10000; thissess.retries = targaddrs->retryCount; DEBUGMSGTL(("target_sessions", "timeout: %d -> %ld\n", Index: net-snmp-5.7.2/agent/mibgroup/notification/snmpNotifyTable.c =================================================================== --- net-snmp-5.7.2.orig/agent/mibgroup/notification/snmpNotifyTable.c +++ net-snmp-5.7.2/agent/mibgroup/notification/snmpNotifyTable.c @@ -331,7 +331,7 @@ notifyTable_register_notifications(int m ptr->tAddressLen = t->remote_length; ptr->tAddress = t->remote; - ptr->timeout = ss->timeout / 1000; + ptr->timeout = ss->timeout / 10000; ptr->retryCount = ss->retries; SNMP_FREE(ptr->tagList); ptr->tagList = strdup(ptr->name); ++++++ net-snmp-5.7.2.tar.gz -> net-snmp-5.7.2.1.tar.gz ++++++ ++++ 2024 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0