January 2016 - openSUSE Commits - openSUSE Mailing Lists

commit linuxrc for openSUSE:Factory
by root＠hilbert.suse.de 30 Jan '16

30 Jan '16

Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2016-01-30 11:34:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-01-21 23:41:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2016-01-30 11:34:39.000000000 +0100 @@ -1,0 +2,19 @@ +Thu Jan 28 10:00:17 UTC 2016 - snwint(a)suse.com + +- ensure we activate the correct interface when using vlan +- fix routing config when using vlan (bsc#961624) +- 5.0.68 + +------------------------------------------------------------------- +Wed Jan 27 09:05:17 UTC 2016 - snwint(a)suse.com + +- Modified file.c to only accept valid types of OsaInterface (bsc#937437) +- 5.0.67 + +------------------------------------------------------------------- +Tue Jan 26 11:00:19 UTC 2016 - snwint(a)suse.com + +- documented linuxrc/yast interface +- 5.0.66 + +------------------------------------------------------------------- Old: ---- linuxrc-5.0.65.tar.xz New: ---- linuxrc-5.0.68.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.KNSZj7/_old 2016-01-30 11:34:40.000000000 +0100 +++ /var/tmp/diff_new_pack.KNSZj7/_new 2016-01-30 11:34:40.000000000 +0100 @@ -25,7 +25,7 @@ Summary: SUSE Installation Program License: GPL-3.0+ Group: System/Boot -Version: 5.0.65 +Version: 5.0.68 Release: 0 Source: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ linuxrc-5.0.65.tar.xz -> linuxrc-5.0.68.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.65/VERSION new/linuxrc-5.0.68/VERSION --- old/linuxrc-5.0.65/VERSION 2016-01-19 09:57:06.000000000 +0100 +++ new/linuxrc-5.0.68/VERSION 2016-01-28 10:56:46.000000000 +0100 @@ -1 +1 @@ -5.0.65 +5.0.68 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.65/changelog new/linuxrc-5.0.68/changelog --- old/linuxrc-5.0.65/changelog 2016-01-19 09:57:06.000000000 +0100 +++ new/linuxrc-5.0.68/changelog 2016-01-28 10:56:46.000000000 +0100 @@ -1,3 +1,13 @@ +2016-01-25: 5.0.68 + - ensure we activate the correct interface when using vlan + - fix routing config when using vlan (bsc #961624) + +2016-01-25: 5.0.67 + - Modified file.c to only accept valid types of OsaInterface (bsc #937437) + +2016-01-26: 5.0.66 + - documented linuxrc/yast interface + 2016-01-19: 5.0.65 - squashfs.ko might depend on lz4_decompress (bsc #962493) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.65/file.c new/linuxrc-5.0.68/file.c --- old/linuxrc-5.0.65/file.c 2016-01-19 09:57:06.000000000 +0100 +++ new/linuxrc-5.0.68/file.c 2016-01-28 10:56:46.000000000 +0100 @@ -1235,7 +1235,14 @@ if(f->is.numeric) config.hwp.protocol = f->nvalue + 1; break; case key_osainterface: - if(*f->value) config.hwp.interface=file_sym2num(f->value); + if(*f->value) { + config.hwp.interface=file_sym2num(f->value); + if(config.hwp.interface != di_osa_lcs && + config.hwp.interface != di_osa_qdio) { + log_show("\n*** The OsaInterface type of \"%s\" is not valid. Ignoring it.\n", f->value); + config.hwp.interface=0; + } + } break; /* * The layer2 attribute is handled specially. We use IFNOTAUTO later on in net.c, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.65/linuxrc_yast_interface.txt new/linuxrc-5.0.68/linuxrc_yast_interface.txt --- old/linuxrc-5.0.65/linuxrc_yast_interface.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/linuxrc-5.0.68/linuxrc_yast_interface.txt 2016-01-28 10:56:46.000000000 +0100 @@ -0,0 +1,301 @@ +linuxrc - yast interface +======================== + +linuxrc communicates with yast via two files: + +(1) /etc/install.inf + This file is written before linuxrc starts yast and contains a number of + variable settings in a 'key: value' (one per line) format. + yast is quite picky when parsing this file and makes e.g. a difference + between a missing key and a key set to 0. + +(2) /etc/yast.inf + This file is written by yast when it exits and tells linuxrc what it should + do or whether there was some error. + Entries are also in a 'key: value' format. + + +*** Note *** + + This document describes the settings in both file from a developer's + perspective. At some places, I've added some additional remarks between + dashes ('-') when something needs further clarification. + + This covers the current situation (master branch in git). In the past + linuxrc used to put also a number of network config settings into + install.inf, but this is no longer the case. + + += = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = + +yast.inf +-------- + +# char* config.new_root +# int config.restart_method +# action, linuxrc should take +# if device, it's put into config.new_root and we chroot there and start +# else, set config.restart_method: reboot = 1, halt = 2, kexec = 3 +# - I think yast never puts a device here - +Root: reboot|halt|kexec|<device to start from> + +# char* config.keymap +# load keymap +# if set, takes the keyboard setting from yast +# - unused by yast? - +Keytable: %s + +# config.language = set_langidbyname(char*) +# set language +# if set, takes the lang setting from yast +# - unused by yast? - +Language: %s + +# int config.rebootmsg +# - obsolete - +# that's really an obscue feature showing a popup asking the user to +# remove CD or floppy when the machine is about to reboot +RebootMsg: %d + +# int config.aborted +# != 0 indicates to linuxrc that yast bas been (deliberately) aborted +# linuxrc then shows no error message +Aborted: %d + + +*** Note *** + + (1) at least 'Root' || 'Aborted' should be set + + (2) linuxrc also checks the yast exit code + + (3) Keytable and Language _can_ be set (don't know if they still are) to + tell linuxrc the current settings. linuxrc in turn will pass them on via + install.inf in case the user runs yast again. linuxrc itself does not care + about the Language setting (no translations any longer). + + += = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = + +install.inf +----------- + +# if != 0, linuxrc was in manual mode +# (yes, it can be > 1) +# - only s390x people seem to use manual mode regularly (because they +# strictly do what's documented); I would question that yast2 working specially +# when manual mode was active [showing extra dialogs] is still justified) - +Manual: %d + +# the current locale (default to en_US) +Locale: %s + +# console keyboard mapping, if linuxrc did change it (e.g. de-latin1-nodeadkeys) +# else the entry is missing +Keytable: %s + +# console device name if it's a serial line (e.g. /dev/ttyS0) +# else the entry is missing +Console: %s + +# 0 or 1, indicating that linuxrc left the install repo mounted at /var/adm/mount +# - does it really matter? yast unmounts the repo anyway at startup, or not? - +Sourcemounted: %s + +# the install repo location in URI form +# - that was used sometime in the past, I think it's obsolete - +# the relevant entry is ZyppRepoURL +RepoURL: %s + +# the install repo location in URI form for libzypp +ZyppRepoURL: %s + +# whether to verify ssl certificates +# Use boot option ssl.certs=0 to get this. +# In some (test) setups it's useful to disable the checks. +# The entry is missing (there's no 'ssl_verify: yes' or so) if cert checks +# are active (the default). +ssl_verify: no + +# the repo device/partition for a local install, without leading '/dev/' +# e.g. disk/by-id/ata-WDC_WD10EARS-00Y4B2_WD-WCAV587297-part2 +# missing for a network install +# - obsolete, go for ZyppRepoURL - +Device: %s + +# proxy setting, if any was specified +# else the entry is missing +ProxyURL: %s + +# the hostname as set by dhcp or by 'hostname=foo' boot option +# entry is missing if unset +Hostname: %s + +# URL for registration server, use 'regurl' boot option to set +# fate#303335 +# entry is missing if unset +# - code for this is at a strange place in linuxrc, should be moved - +regurl: %s + +# certificates for registration server, use 'regcert' boot option to set +# fate#303335 +# entry is missing if unset +# - code for this is at a strange place in linuxrc, should be moved - +regcert: %s + +# URL for uploadeing supportconfig data, use 'supporturl' boot option to set +# fate#305180 +# entry is missing if unset +# - code for this is at a strange place in linuxrc, should be moved - +supporturl: %s + +# list of modules, separated by spaces (e.g.: scsi_dh st sg) that +# were needed to activate the hardware so far +InitrdModules: %s + +# for each module in InitrdModules that was loaded using special parameters, +# list module followed by parameter string +# e.g.: foo xxx=1 bar=5 +# there's a separate 'Options' line for each such module +Options: %s + +# if(config.restart_method) +# - obsolete - (technically impossible to actually see this entry) +Reboot: Reboot|Halt|kexec + +# set via 'loghost' boot option +# entry is missing if unset +# - this is unused by linuxrc and just passed on - +LogHost: %s + +# this entry is always there +# - makes no sense, can we get rid of it? - +Keyboard: 1 + +# base dir where we look for driver updates +# e.g. /linux/suse/x86_64-13.2 +# entry is always defined +UpdateDir: %s + +# a driver update has been used +# - obsolete? - +YaST2update: 0|1 + +# 1: yast should run in text mode (ncurses) +Textmode: 0|1 + +# autoyast URL +# entry is missing if unset +AutoYaST: %s + +# free memory in kiB +MemFree: %d + +# 1: do a VNC install +VNC: 0|1 + +# VNC password +# entry is missing if unset +VNCPassword: %s + +# IP or DISPLAY var to use for X11 connection +# e.g. 10.0.0.1 or 10.10.0.1:2 +# (at least I _think_ the ':port' notation is allowed in recent yast versions) +# this is basically used only on s390x +# entry is missing if unset +Display_IP: %s + +# 1: yast is accessed via SSH +# see also 'SSHD' below +UseSSH: 0|1 + +# 1: an SSH server should be started +# see also 'UseSSH' above +# note: up to SLE12/oS13.2 there was only 'UseSSH' implicitly starting sshd; +# now both have been logically separated and you can get sshd running without +# forcing yast into ssh mode (useful for debugging) +SSHD: 0|1 + +# 1: don't start any shells on some consoles during installation (security considerations) +# entry is missing if unset (0) +NoShell: 1 + +# build ID of initrd +# I can't think of any use for this +# - obsolete? - +# entry is missing if unset +InitrdID: %s + +# build Id of inst-sys +# I can't think of any use for this +# - obsolete? - +# entry is missing if unset +InstsysID: %s + +# 1: activate iscsi config dialogs +# the value is auto-detected and can be overridden with 'withiscsi' boot option +WithiSCSI: 0|1 + +# 1: activate fcoe config dialogs +# the value is auto-detected and can be overridden with 'withfcoe' boot option +WithFCoE: 0|1 + +# 1: start shell before and after running yast (for debugging) +StartShell: %d + +# value of the 'y2gdb' boot option, just passed on to yast +# no idea if that is still used by yast +# - obsolete? - +Y2GDB: 0|1 + +# value of 'kexecreboot' boot option, just passed on to yast +# (boot installed system using kexec, default = 1) +kexec_reboot: 0|1 + +# 1: configure as an EFI system +# the value is auto-detected and can be overridden with 'efi' boot option +EFI: %d + +# 1: yast should do an upgrade +# entry is missing if unset (0) +Upgrade: 1 + +# set via 'rootpassword' boot option +# if set to 'ask', linuxrc will show a dialog asking for a password +# this should be used a temporary root password for the target system +# - ??? is this really used ??? - +# entry is missing if unset +RootPassword: %s + +# set via 'brokenmodules' boot option +# comma(,)-separated list of modules that must not be loaded +# - is this actually used by yast? - +# entry is missing if unset +BrokenModules: %s + +# braille device tyde (e.g. ht30) +# - still used? - +# entry is missing if 'Brailledevice' is unset +Braille: %s + +# device braille line is connected to +# - still used? - +# entry is missing if unset +Brailledevice: %s + +# any options mentioned in the 'ptoptions' boot option that were set +# please check https://en.opensuse.org/SDB:Linuxrc#p_ptoptions for some explanation +# e.g.: +FOO: %s + +# any boot options linuxrc didn't handle and that should probably +# be kept for the target system boot config +# entry is missing if unset +Cmdline: %s + + +*** Note *** + + There may be some more entries in install.inf but they are put there by + some inst-sys scripts and not linuxrc. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.65/net.c new/linuxrc-5.0.68/net.c --- old/linuxrc-5.0.65/net.c 2016-01-19 09:57:06.000000000 +0100 +++ new/linuxrc-5.0.68/net.c 2016-01-28 10:56:46.000000000 +0100 @@ -259,7 +259,15 @@ return 1; } - net_wicked_up(config.ifcfg.manual->device); + char *ifname = NULL; + + str_copy(&ifname, config.ifcfg.manual->device); + + if(config.ifcfg.manual->vlan) strprintf(&ifname, "%s.%s", ifname, config.ifcfg.manual->vlan); + + net_wicked_up(ifname); + + str_copy(&ifname, NULL); return 0; } @@ -1176,16 +1184,24 @@ strprintf(&ifcfg->type, "dhcp%s", type); ifcfg->flags = config.ifcfg.manual->flags; + str_copy(&ifcfg->vlan, config.ifcfg.manual->vlan); cfg_ok = ifcfg_write(device, ifcfg, 0); free(ifcfg->type); + free(ifcfg->vlan); free(ifcfg); ifcfg = NULL; if(!cfg_ok) return; - strprintf(&buf, "Sending DHCP%s request to %s...", type, device); + char *ifname = NULL; + + str_copy(&ifname, device); + + if(config.ifcfg.manual->vlan) strprintf(&ifname, "%s.%s", ifname, config.ifcfg.manual->vlan); + + strprintf(&buf, "Sending DHCP%s request to %s...", type, ifname); log_show_maybe(!config.win, "%s\n", buf); if(config.win) { dia_info(&win, buf, MSGTYPE_INFO); @@ -1194,19 +1210,19 @@ net_apply_ethtool(device, NULL); - net_wicked_up(device); + net_wicked_up(ifname); if(config.net.ipv4) { - snprintf(file, sizeof file, "/run/wicked/leaseinfo.%s.dhcp.ipv4", device); + snprintf(file, sizeof file, "/run/wicked/leaseinfo.%s.dhcp.ipv4", ifname); parse_leaseinfo(file); } if(!got_ip && config.net.ipv6) { - snprintf(file, sizeof file, "/run/wicked/leaseinfo.%s.dhcp.ipv6", device); + snprintf(file, sizeof file, "/run/wicked/leaseinfo.%s.dhcp.ipv6", ifname); parse_leaseinfo(file); } - if(slist_getentry(config.ifcfg.if_up, device)) got_ip = 1; + if(slist_getentry(config.ifcfg.if_up, ifname)) got_ip = 1; if(config.win) win_close(&win); @@ -1241,6 +1257,8 @@ else { log_show_maybe(!config.win, "no/incomplete answer.\n"); } + + str_copy(&ifname, NULL); } @@ -2229,11 +2247,11 @@ // set explicit route to gw unless gw is in the same ipv4 subnet // note: we might as well set it always if(!compare_subnet(v4_ip, sl1->key, v4_prefix)) { - strprintf(&sl->key, "%s - - %s", sl1->key, device); + strprintf(&sl->key, "%s - - %s%s", sl1->key, device, vlan ?: ""); sl = slist_append(&sl_ifroute, slist_new()); } - strprintf(&sl->key, "default %s - %s", sl1->key, device); + strprintf(&sl->key, "default %s - %s%s", sl1->key, device, vlan ?: ""); } slist_free(sl0);

1 0

commit dhcp for openSUSE:Factory
by root＠hilbert.suse.de 30 Jan '16

30 Jan '16

Hello community, here is the log from the commit of package dhcp for openSUSE:Factory checked in at 2016-01-30 11:34:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dhcp (Old) and /work/SRC/openSUSE:Factory/.dhcp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dhcp" Changes: -------- --- /work/SRC/openSUSE:Factory/dhcp/dhcp.changes 2015-10-17 16:36:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dhcp.new/dhcp.changes 2016-01-30 11:34:35.000000000 +0100 @@ -1,0 +2,14 @@ +Tue Jan 26 17:16:45 CET 2016 - ndas(a)suse.de + +- Update to dhcp-4.3.3-P1 correcting bounds checking when + receiving a packet (bsc#961305,CVE-2015-8605,ISC-Bugs#41267). +- adjusted interval check. + [*0019-dhcp-4.2.4-P1-interval.patch] +- Fixed improper lease duration checking. Also added fixes for integer + overflows in the date and time handling code(bsc#936923, bsc#880984). + [+0020-dhcp-4.x.x-fixed-improper-lease-duration-checking.patch] +- fixed service files to start dhcpd after slapd (bsc#956159) +- dhclient-script: complain in the log about conflicts, added + a see log messages to the dhclient log message (bsc#960506) + [* 0018-client-fail-on-script-pre-init-error-bsc-912098.patch] +------------------------------------------------------------------- Old: ---- dhcp-4.3.3.tar.gz dhcp-4.3.3.tar.gz.asc New: ---- 0020-dhcp-4.x.x-fixed-improper-lease-duration-checking.patch dhcp-4.3.3-P1.tar.gz dhcp-4.3.3-P1.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dhcp.spec ++++++ --- /var/tmp/diff_new_pack.FAsUde/_old 2016-01-30 11:34:37.000000000 +0100 +++ /var/tmp/diff_new_pack.FAsUde/_new 2016-01-30 11:34:37.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package dhcp # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX 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,7 +16,7 @@ # -%define isc_version 4.3.3 +%define isc_version 4.3.3-P1 %define susefw2dir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services %define omc_prefix /usr/share/omc %define omc_svcdir %{omc_prefix}/svcinfo.d @@ -41,7 +41,7 @@ %endif BuildRequires: dos2unix BuildRequires: libtool -Version: 4.3.3 +Version: 4.3.3.P1 Release: 0 Summary: Common Files Used by ISC DHCP Software License: BSD-3-Clause @@ -118,6 +118,7 @@ Patch18: 0018-client-fail-on-script-pre-init-error-bsc-912098.patch # PATCH-FIX-SLE dhcp-4.2.4-P1-interval bsc#947780 Patch19: 0019-dhcp-4.2.4-P1-interval.patch +Patch20: 0020-dhcp-4.x.x-fixed-improper-lease-duration-checking.patch ## PreReq: /bin/touch /sbin/chkconfig sysconfig BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -249,6 +250,7 @@ %patch17 -p1 %patch18 -p1 %patch19 -p1 +%patch20 -p1 ## find . -type f -name \*.cat\* -exec rm -f {} \; dos2unix contrib/ms2isc/* ++++++ 0018-client-fail-on-script-pre-init-error-bsc-912098.patch ++++++ --- /var/tmp/diff_new_pack.FAsUde/_old 2016-01-30 11:34:37.000000000 +0100 +++ /var/tmp/diff_new_pack.FAsUde/_new 2016-01-30 11:34:37.000000000 +0100 @@ -40,7 +40,7 @@ + } + } + if (failed) { -+ log_fatal("%s: unable to pre-init requested interfaces", ++ log_fatal("%s: unable to pre-init requested interfaces -- see log messages", + path_dhclient_script); } } ++++++ 0019-dhcp-4.2.4-P1-interval.patch ++++++ --- /var/tmp/diff_new_pack.FAsUde/_old 2016-01-30 11:34:37.000000000 +0100 +++ /var/tmp/diff_new_pack.FAsUde/_new 2016-01-30 11:34:37.000000000 +0100 @@ -4,7 +4,7 @@ isc_time_nowplusinterval() is not safe with 64-bit time_t (#662254, #789601) -References: bsc#947780 +References: bsc#947780, bsc#880984 Index: dhcp-4.2.4-P2/common/dispatch.c =================================================================== --- dhcp-4.2.4-P2.orig/common/dispatch.c @@ -31,3 +31,20 @@ status = isc_time_nowplusinterval(&expires, &interval); if (status != ISC_R_SUCCESS) { /* +From: Nirmoy Das <ndas(a)suse.de> +Date: Tue, 26 Jan 2016 13:36:28 +0100 +Subject: [PATCH] adjusted interval check + +Index: dhcp-4.3.3/common/dispatch.c +=================================================================== +--- dhcp-4.3.3.orig/common/dispatch.c ++++ dhcp-4.3.3/common/dispatch.c +@@ -349,7 +349,7 @@ void add_timeout (when, where, what, ref + * gone by since the last call to gettimeofday() and the one in + * isc_time_nowplusinterval(). + */ +- if (sec > TIME_MAX) ++ if (sec > TIME_MAX - 9) + sec = TIME_MAX - 9; + + isc_interval_set(&interval, sec, usec * 1000); ++++++ 0020-dhcp-4.x.x-fixed-improper-lease-duration-checking.patch ++++++ From: Marius Tomaschewski <mt(a)suse.de> Date: Tue, 12 Jan 2016 15:42:22 +0100 Subject: [PATCH] fixed improper lease duration checking. References: bsc#936923, bsc#880984 year 2038 is EOT only for 32 bit machine. This patch checks wordsize and do a proper EOT checking on lease duration. It also fixes integer overflows in the date and time handling code. diff --git a/common/parse.c b/common/parse.c index 22e7d58..e9e53a4 100644 --- a/common/parse.c +++ b/common/parse.c @@ -939,7 +939,7 @@ TIME parse_date_core(cfile) struct parse *cfile; { - int guess; + long guess; int tzoff, year, mon, mday, hour, min, sec; const char *val; enum dhcp_token token; @@ -966,7 +966,7 @@ parse_date_core(cfile) } skip_token(&val, NULL, cfile); /* consume number */ - guess = atoi(val); + guess = atol(val); return((TIME)guess); } @@ -1113,11 +1113,22 @@ parse_date_core(cfile) * overflow issues. We could try and be more precise but there * doesn't seem to be a good reason to worry about it and waste * the cpu looking at the rest of the date. */ - if (year >= 138) - return(MAX_TIME); - + if (sizeof(time_t) == 8) { + /* 2038 is not an issue on 64bit. time calculations + * start to fail at almost INT_MAX (- some guard) */ + if (year > 0x7fff0000) + return(MAX_TIME); + } else { + /* assume 32bit with end in 2038 */ + if (year >= 138) + return(MAX_TIME); + } + /* I don't think we need to care about lease starts before 1900 */ + if (year < 0) + return((TIME)0); + /* Guess the time value... */ - guess = ((((((365 * (year - 70) + /* Days in years since '70 */ + guess = ((((((365 * ((long)year - 70) + /* Days in years since '70 */ (year - 69) / 4 + /* Leap days since '70 */ (mon /* Days in months this year */ ? months [mon - 1] diff --git a/includes/dhcpd.h b/includes/dhcpd.h index 4270edc..1af4c5b 100644 --- a/includes/dhcpd.h +++ b/includes/dhcpd.h @@ -1561,7 +1561,7 @@ typedef unsigned char option_mask [16]; #define DHCPD_LOG_FACILITY LOG_DAEMON #endif -#define MAX_TIME 0x7fffffff +#define MAX_TIME LONG_MAX #define MIN_TIME 0 #ifdef USE_LOG_PID ++++++ dhclient-script ++++++ --- /var/tmp/diff_new_pack.FAsUde/_old 2016-01-30 11:34:37.000000000 +0100 +++ /var/tmp/diff_new_pack.FAsUde/_new 2016-01-30 11:34:37.000000000 +0100 @@ -73,14 +73,26 @@ { local _id=`/usr/bin/systemctl --no-pager -p Id show network.service 2>/dev/null` case "${_id#Id=}" in - # wicked is using an another dhcp client - wicked.service) return 1 ;; + # wicked is using an another dhcp client - dhclient + # is not supported with enabled wicked and disabled. + wicked.service) + logger -t "${0##*/}" -p daemon.error -- \ + "dhclient conflicts with enabled ${_id#Id=} and disabled" + return 1 + ;; - # NetworkManager is using another script - #NetworkManager.service) return 1 ;; + # NetworkManager is using an another script + # [disarmed except maintainer requests it] + #NetworkManager.service) + # logger -t "${0##*/}" -p daemon.error -- \ + # "dhclient-script conflicts with enabled ${_id#Id=} script and disabled" + # return 1 + #;; - # sysconfig network were using it, other? - network.service|*) return 0 ;; + # sysconfig network [gone] were using it, other? + network.service|*) + return 0 + ;; esac } ++++++ dhcpd.service ++++++ --- /var/tmp/diff_new_pack.FAsUde/_old 2016-01-30 11:34:37.000000000 +0100 +++ /var/tmp/diff_new_pack.FAsUde/_new 2016-01-30 11:34:37.000000000 +0100 @@ -1,7 +1,7 @@ [Unit] Description=ISC DHCPv4 Server Before=multi-user.target -After=remote-fs.target network.target nss-lookup.target time-sync.target ldap.service ndsd.service +After=remote-fs.target network.target nss-lookup.target time-sync.target slapd.service sssd.service ndsd.service [Service] Type=forking ++++++ dhcpd6.service ++++++ --- /var/tmp/diff_new_pack.FAsUde/_old 2016-01-30 11:34:37.000000000 +0100 +++ /var/tmp/diff_new_pack.FAsUde/_new 2016-01-30 11:34:37.000000000 +0100 @@ -1,7 +1,7 @@ [Unit] Description=ISC DHCPv6 Server Before=multi-user.target -After=remote-fs.target network.target nss-lookup.target time-sync.target ldap.service ndsd.service +After=remote-fs.target network.target nss-lookup.target time-sync.target slapd.service sssd.service ndsd.service [Service] Type=forking

1 0

commit libxcb for openSUSE:Factory
by root＠hilbert.suse.de 30 Jan '16

30 Jan '16

Hello community, here is the log from the commit of package libxcb for openSUSE:Factory checked in at 2016-01-30 11:34:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libxcb (Old) and /work/SRC/openSUSE:Factory/.libxcb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libxcb" Changes: -------- --- /work/SRC/openSUSE:Factory/libxcb/libxcb.changes 2015-09-11 09:02:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libxcb.new/libxcb.changes 2016-01-30 11:34:31.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Dec 23 23:16:43 UTC 2015 - eich(a)suse.com + +- n_If-auth-with-credentials-for-hostname-fails-retry-with-XAUTHLOCALHOSTNAME.patch: + If auth with credentials for hostname fails retry with XAUTHLOCALHOSTNAME + (boo#906622). + +------------------------------------------------------------------- New: ---- n_If-auth-with-credentials-for-hostname-fails-retry-with-XAUTHLOCALHOSTNAME.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxcb.spec ++++++ --- /var/tmp/diff_new_pack.qhJXIc/_old 2016-01-30 11:34:32.000000000 +0100 +++ /var/tmp/diff_new_pack.qhJXIc/_new 2016-01-30 11:34:32.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libxcb # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,7 +31,7 @@ Source: %{name}-%{version}.tar.bz2 Source1: baselibs.conf Patch1: bug-262309_xcb-xauthlocalhostname.diff - +Patch2: n_If-auth-with-credentials-for-hostname-fails-retry-with-XAUTHLOCALHOSTNAME.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf >= 2.57 BuildRequires: automake @@ -401,6 +401,7 @@ %prep %setup -q %patch -P 1 -p0 +%patch2 -p1 %build ./autogen.sh ++++++ n_If-auth-with-credentials-for-hostname-fails-retry-with-XAUTHLOCALHOSTNAME.patch ++++++ From: Egbert Eich <eich(a)suse.de> Date: Thu Dec 24 00:11:43 2015 +0100 Subject: [PATCH]If auth with credentials for hostname fails retry with XAUTHLOCALHOSTNAME Patch-mainline: never References: boo#906622 Signed-off-by: Egbert Eich <eich(a)suse.com> Signed-off-by: Egbert Eich <eich(a)suse.de> --- src/xcb_auth.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/src/xcb_auth.c b/src/xcb_auth.c index 6eb6528..777c772 100644 --- a/src/xcb_auth.c +++ b/src/xcb_auth.c @@ -109,7 +109,7 @@ static int authname_match(enum auth_protos kind, char *name, size_t namelen) #define SIN6_ADDR(s) (&((struct sockaddr_in6 *)s)->sin6_addr) -static Xauth *get_authptr(struct sockaddr *sockname, int display) +static Xauth *get_authptr(struct sockaddr *sockname, int display, int *stage) { char *addr = 0; int addrlen = 0; @@ -119,6 +119,8 @@ static Xauth *get_authptr(struct sockaddr *sockname, int display) int dispbuflen; Xauth *authptr = NULL; + if (*stage == 2) + return NULL; family = FamilyLocal; /* 256 */ switch(sockname->sa_family) { @@ -161,10 +163,13 @@ static Xauth *get_authptr(struct sockaddr *sockname, int display) addrlen = strlen(addr); } - authptr = XauGetBestAuthByAddr (family, - (unsigned short) addrlen, addr, - (unsigned short) dispbuflen, dispbuf, - N_AUTH_PROTOS, authnames, authnameslen); + if (*stage == 0) { + authptr = XauGetBestAuthByAddr (family, + (unsigned short) addrlen, addr, + (unsigned short) dispbuflen, dispbuf, + N_AUTH_PROTOS, authnames, authnameslen); + *stage = 1; + } // && !phostname if ((!authptr || !authptr->data_length) && family == FamilyLocal) { if ( (addr = getenv("XAUTHLOCALHOSTNAME")) ) { @@ -172,6 +177,7 @@ static Xauth *get_authptr(struct sockaddr *sockname, int display) (unsigned short) strlen(addr), addr, (unsigned short) dispbuflen, dispbuf, N_AUTH_PROTOS, authnames, authnameslen); + *stage = 2; } } return authptr; @@ -328,6 +334,7 @@ int _xcb_get_auth_info(int fd, xcb_auth_info_t *info, int display) int gotsockname = 0; Xauth *authptr = 0; int ret = 1; + int stage = 0; /* Some systems like hpux or Hurd do not expose peer names * for UNIX Domain Sockets, but this is irrelevant, @@ -344,8 +351,8 @@ int _xcb_get_auth_info(int fd, xcb_auth_info_t *info, int display) } gotsockname = 1; } - - authptr = get_authptr(sockname, display); +retry: + authptr = get_authptr(sockname, display, &stage); if (authptr == 0) { free(sockname); @@ -371,7 +378,10 @@ int _xcb_get_auth_info(int fd, xcb_auth_info_t *info, int display) if(!ret) { free(info->name); - goto no_auth; /* cannot build auth record */ + info->name = 0; + info->namelen = 0; + XauDisposeAuth(authptr); + goto retry; /* cannot build auth record */ } free(sockname);

1 0

commit gegl for openSUSE:Factory
by root＠hilbert.suse.de 30 Jan '16

30 Jan '16

Hello community, here is the log from the commit of package gegl for openSUSE:Factory checked in at 2016-01-30 11:34:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gegl (Old) and /work/SRC/openSUSE:Factory/.gegl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gegl" Changes: -------- --- /work/SRC/openSUSE:Factory/gegl/gegl.changes 2014-10-29 21:09:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gegl.new/gegl.changes 2016-01-30 11:34:27.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Jan 26 14:00:45 UTC 2016 - idonmez(a)suse.com + +- Add gegl-0.2.0-linker-flags.patch to add -lm to linker flags + +------------------------------------------------------------------- New: ---- gegl-0.2.0-linker-flags.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gegl.spec ++++++ --- /var/tmp/diff_new_pack.4W4tgM/_old 2016-01-30 11:34:28.000000000 +0100 +++ /var/tmp/diff_new_pack.4W4tgM/_new 2016-01-30 11:34:28.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gegl # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -34,6 +34,8 @@ # Use rpmbuild -D 'BUILD_ORIG 1' -D 'BUILD_ORIG_ADDON 1' to build patched build plus original as addon. # PATCH-FIX-UPSTREAM sutesparse changed UF_long for SuiteSparse_long Patch2: gegl-UF_long.patch +# PATCH-FIX-UPSTREAM gegl-0.2.0-linker-flags.patch idoenmez(a)suse.de -- Add -lm to linker flags +Patch3: gegl-0.2.0-linker-flags.patch BuildRequires: ImageMagick BuildRequires: OpenEXR-devel BuildRequires: SDL-devel @@ -156,6 +158,7 @@ %if 0%{?suse_version} > 1310 %patch2 -p1 %endif +%patch3 -p1 # docs-build-fix.diff %build ++++++ gegl-0.2.0-linker-flags.patch ++++++ diff -urNp gegl-0.2.0.orig/bin/Makefile.in gegl-0.2.0/bin/Makefile.in --- gegl-0.2.0.orig/bin/Makefile.in 2015-05-07 15:06:23.716649233 +0200 +++ gegl-0.2.0/bin/Makefile.in 2015-05-07 15:08:38.104260506 +0200 @@ -363,7 +363,7 @@ AM_CFLAGS = \ AM_LDFLAGS = \ $(no_undefined) ../gegl/libgegl-$(GEGL_API_VERSION).la \ - $(DEP_LIBS) $(BABL_LIBS) $(PNG_LIBS) $(LIBSPIRO) + $(DEP_LIBS) $(BABL_LIBS) $(PNG_LIBS) $(LIBSPIRO) -lm gegl_SOURCES = gegl.c gegl-options.c gegl-options.h gegl-path-smooth.c \ gegl-path-smooth.h $(am__append_1) diff -urNp gegl-0.2.0.orig/examples/Makefile.in gegl-0.2.0/examples/Makefile.in --- gegl-0.2.0.orig/examples/Makefile.in 2015-05-07 15:06:23.674649046 +0200 +++ gegl-0.2.0/examples/Makefile.in 2015-05-07 16:13:36.057203261 +0200 @@ -376,7 +376,7 @@ AM_CPPFLAGS = \ AM_CFLAGS = $(DEP_CFLAGS) $(GTK_CFLAGS) $(BABL_CFLAGS) $(PNG_CFLAGS) AM_LDFLAGS = \ $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la \ - $(DEP_LIBS) $(GTK_LIBS) $(BABL_LIBS) $(PNG_LIBS) + $(DEP_LIBS) $(GTK_LIBS) $(BABL_LIBS) $(PNG_LIBS) -lm all: all-recursive diff -urNp gegl-0.2.0.orig/tools/Makefile.in gegl-0.2.0/tools/Makefile.in --- gegl-0.2.0.orig/tools/Makefile.in 2015-05-07 15:06:23.716649233 +0200 +++ gegl-0.2.0/tools/Makefile.in 2015-05-07 15:31:43.643298848 +0200 @@ -394,7 +394,7 @@ AM_CPPFLAGS = \ AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS) AM_LDFLAGS = \ $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la \ - $(DEP_LIBS) $(BABL_LIBS) + $(DEP_LIBS) $(BABL_LIBS) -lm @HAVE_EXIV2_TRUE@exp_combine_SOURCES = exp_combine.cpp @HAVE_EXIV2_TRUE@exp_combine_LDADD = $(EXIV2_LIBS)

1 0

commit biosdevname for openSUSE:Factory
by root＠hilbert.suse.de 30 Jan '16

30 Jan '16

Hello community, here is the log from the commit of package biosdevname for openSUSE:Factory checked in at 2016-01-30 11:34:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/biosdevname (Old) and /work/SRC/openSUSE:Factory/.biosdevname.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "biosdevname" Changes: -------- --- /work/SRC/openSUSE:Factory/biosdevname/biosdevname.changes 2015-12-18 21:52:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.biosdevname.new/biosdevname.changes 2016-01-30 11:34:22.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Jan 17 10:14:18 UTC 2016 - mpluskal(a)suse.com + +- Update to 0.7.1 + * no upstream changelog provided + +------------------------------------------------------------------- Old: ---- biosdevname-0.6.2.tar.gz New: ---- biosdevname-0.7.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ biosdevname.spec ++++++ --- /var/tmp/diff_new_pack.tF4W01/_old 2016-01-30 11:34:23.000000000 +0100 +++ /var/tmp/diff_new_pack.tF4W01/_new 2016-01-30 11:34:23.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package biosdevname # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %define _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d Name: biosdevname -Version: 0.6.2 +Version: 0.7.1 Release: 0 Summary: Udev helper for naming devices per BIOS names License: GPL-2.0 ++++++ biosdevname-0.6.2.tar.gz -> biosdevname-0.7.1.tar.gz ++++++ ++++ 17842 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/biosdevname-0.6.2/INSTALL new/biosdevname-0.7.1/INSTALL --- old/biosdevname-0.6.2/INSTALL 2015-04-15 18:41:49.000000000 +0200 +++ new/biosdevname-0.7.1/INSTALL 2015-12-18 17:19:26.000000000 +0100 @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation, -Inc. +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008, 2009 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -226,11 +226,6 @@ and if that doesn't work, install pre-built binaries of GCC for HP-UX. - HP-UX `make' updates targets which have the same time stamps as -their prerequisites, which makes it generally unusable when shipped -generated files such as `configure' are involved. Use GNU `make' -instead. - On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot parse its `<wchar.h>' header file. The option `-nodtk' can be used as a workaround. If GNU CC is not installed, it is therefore recommended @@ -309,10 +304,9 @@ overridden in the site shell script). Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf limitation. Until the limitation is lifted, you can use -this workaround: +an Autoconf bug. Until the bug is fixed you can use this workaround: - CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash `configure' Invocation ====================== @@ -368,3 +362,4 @@ `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/biosdevname-0.6.2/biosdevname.spec.fedora new/biosdevname-0.7.1/biosdevname.spec.fedora --- old/biosdevname-0.6.2/biosdevname.spec.fedora 2015-04-15 18:42:30.000000000 +0200 +++ new/biosdevname-0.7.1/biosdevname.spec.fedora 2015-12-18 17:25:10.000000000 +0100 @@ -1,5 +1,5 @@ Name: biosdevname -Version: 0.6.2 +Version: 0.7.1 Release: 1%{?dist} Summary: Udev helper for naming devices per BIOS names diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/biosdevname-0.6.2/biosdevname.spec.suse new/biosdevname-0.7.1/biosdevname.spec.suse --- old/biosdevname-0.6.2/biosdevname.spec.suse 2015-04-15 18:42:30.000000000 +0200 +++ new/biosdevname-0.7.1/biosdevname.spec.suse 2015-12-18 17:25:10.000000000 +0100 @@ -1,5 +1,5 @@ Name: biosdevname -Version: 0.6.2 +Version: 0.7.1 Release: 1%{?dist} Summary: Udev helper for naming devices per BIOS names diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/biosdevname-0.6.2/compile new/biosdevname-0.7.1/compile --- old/biosdevname-0.6.2/compile 2015-04-15 18:41:49.000000000 +0200 +++ new/biosdevname-0.7.1/compile 2015-12-18 17:19:26.000000000 +0100 @@ -1,9 +1,10 @@ #! /bin/sh -# Wrapper for compilers which do not understand '-c -o'. +# Wrapper for compilers which do not understand `-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2009-10-06.20; # UTC -# Copyright (C) 1999-2012 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software +# Foundation, Inc. # Written by Tom Tromey <tromey(a)cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -28,224 +29,21 @@ # bugs to <bug-automake(a)gnu.org> or send patches to # <automake-patches(a)gnu.org>. -nl=' -' - -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent tools from complaining about whitespace usage. -IFS=" "" $nl" - -file_conv= - -# func_file_conv build_file lazy -# Convert a $build file to $host form and store it in $file -# Currently only supports Windows hosts. If the determined conversion -# type is listed in (the comma separated) LAZY, no conversion will -# take place. -func_file_conv () -{ - file=$1 - case $file in - / | /[!/]*) # absolute file, and not a UNC file - if test -z "$file_conv"; then - # lazily determine how to convert abs files - case `uname -s` in - MINGW*) - file_conv=mingw - ;; - CYGWIN*) - file_conv=cygwin - ;; - *) - file_conv=wine - ;; - esac - fi - case $file_conv/,$2, in - *,$file_conv,*) - ;; - mingw/*) - file=`cmd //C echo "$file " | sed -e 's/"$.*$ " *$/\1/'` - ;; - cygwin/*) - file=`cygpath -m "$file" || echo "$file"` - ;; - wine/*) - file=`winepath -w "$file" || echo "$file"` - ;; - esac - ;; - esac -} - -# func_cl_dashL linkdir -# Make cl look for libraries in LINKDIR -func_cl_dashL () -{ - func_file_conv "$1" - if test -z "$lib_path"; then - lib_path=$file - else - lib_path="$lib_path;$file" - fi - linker_opts="$linker_opts -LIBPATH:$file" -} - -# func_cl_dashl library -# Do a library search-path lookup for cl -func_cl_dashl () -{ - lib=$1 - found=no - save_IFS=$IFS - IFS=';' - for dir in $lib_path $LIB - do - IFS=$save_IFS - if $shared && test -f "$dir/$lib.dll.lib"; then - found=yes - lib=$dir/$lib.dll.lib - break - fi - if test -f "$dir/$lib.lib"; then - found=yes - lib=$dir/$lib.lib - break - fi - if test -f "$dir/lib$lib.a"; then - found=yes - lib=$dir/lib$lib.a - break - fi - done - IFS=$save_IFS - - if test "$found" != yes; then - lib=$lib.lib - fi -} - -# func_cl_wrapper cl arg... -# Adjust compile command to suit cl -func_cl_wrapper () -{ - # Assume a capable shell - lib_path= - shared=: - linker_opts= - for arg - do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as 'compile cc -o foo foo.c'. - eat=1 - case $2 in - *.o | *.[oO][bB][jJ]) - func_file_conv "$2" - set x "$@" -Fo"$file" - shift - ;; - *) - func_file_conv "$2" - set x "$@" -Fe"$file" - shift - ;; - esac - ;; - -I) - eat=1 - func_file_conv "$2" mingw - set x "$@" -I"$file" - shift - ;; - -I*) - func_file_conv "${1#-I}" mingw - set x "$@" -I"$file" - shift - ;; - -l) - eat=1 - func_cl_dashl "$2" - set x "$@" "$lib" - shift - ;; - -l*) - func_cl_dashl "${1#-l}" - set x "$@" "$lib" - shift - ;; - -L) - eat=1 - func_cl_dashL "$2" - ;; - -L*) - func_cl_dashL "${1#-L}" - ;; - -static) - shared=false - ;; - -Wl,*) - arg=${1#-Wl,} - save_ifs="$IFS"; IFS=',' - for flag in $arg; do - IFS="$save_ifs" - linker_opts="$linker_opts $flag" - done - IFS="$save_ifs" - ;; - -Xlinker) - eat=1 - linker_opts="$linker_opts $2" - ;; - -*) - set x "$@" "$1" - shift - ;; - *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) - func_file_conv "$1" - set x "$@" -Tp"$file" - shift - ;; - *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) - func_file_conv "$1" mingw - set x "$@" "$file" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift - done - if test -n "$linker_opts"; then - linker_opts="-link$linker_opts" - fi - exec "$@" $linker_opts - exit 1 -} - -eat= - case $1 in '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 + echo "$0: No command. Try \`$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) cat <<\EOF Usage: compile [--help] [--version] PROGRAM [ARGS] -Wrapper for compilers which do not understand '-c -o'. -Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +Wrapper for compilers which do not understand `-c -o'. +Remove `-o dest.o' from ARGS, run PROGRAM with the remaining arguments, and rename the output as expected. If you are trying to build a whole package this is not the -right script to run: please start by reading the file 'INSTALL'. +right script to run: please start by reading the file `INSTALL'. Report bugs to <bug-automake(a)gnu.org>. EOF @@ -255,13 +53,11 @@ echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) - func_cl_wrapper "$@" # Doesn't return... - ;; esac ofile= cfile= +eat= for arg do @@ -270,8 +66,8 @@ else case $1 in -o) - # configure might choose to run compile as 'compile cc -o foo foo.c'. - # So we strip '-o arg' only if arg is an object. + # configure might choose to run compile as `compile cc -o foo foo.c'. + # So we strip `-o arg' only if arg is an object. eat=1 case $2 in *.o | *.obj) @@ -298,10 +94,10 @@ done if test -z "$ofile" || test -z "$cfile"; then - # If no '-o' option was seen then we might have been invoked from a + # If no `-o' option was seen then we might have been invoked from a # pattern rule where we don't need one. That is ok -- this is a # normal compilation that the losing compiler can handle. If no - # '.c' file was seen then we are probably linking. That is also + # `.c' file was seen then we are probably linking. That is also # ok. exec "$@" fi @@ -310,7 +106,7 @@ cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` # Create the lock directory. -# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# Note: use `[/\\:.-]' here to ensure that we don't use the same name # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/biosdevname-0.6.2/config.h.in new/biosdevname-0.7.1/config.h.in --- old/biosdevname-0.6.2/config.h.in 2015-04-15 18:41:48.000000000 +0200 +++ new/biosdevname-0.7.1/config.h.in 2015-12-18 17:19:26.000000000 +0100 @@ -123,7 +123,7 @@ /* Define to 1 if you have the `strtoul' function. */ #undef HAVE_STRTOUL -/* Define to 1 if `domain' is a member of `struct pci_dev'. */ +/* Define to 1 if `domain' is member of `struct pci_dev'. */ #undef HAVE_STRUCT_PCI_DEV_DOMAIN /* Define to 1 if you have the <syslog.h> header file. */ @@ -132,9 +132,6 @@ /* Define to 1 if you have the <sys/ioctl.h> header file. */ #undef HAVE_SYS_IOCTL_H -/* Define to 1 if you have the <sys/param.h> header file. */ -#undef HAVE_SYS_PARAM_H - /* Define to 1 if you have the <sys/select.h> header file. */ #undef HAVE_SYS_SELECT_H @@ -193,9 +190,6 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME -/* Define to the home page for this package. */ -#undef PACKAGE_URL - /* Define to the version of this package. */ #undef PACKAGE_VERSION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/biosdevname-0.6.2/configure.ac new/biosdevname-0.7.1/configure.ac --- old/biosdevname-0.6.2/configure.ac 2015-04-15 18:40:40.000000000 +0200 +++ new/biosdevname-0.7.1/configure.ac 2015-12-18 17:19:18.000000000 +0100 @@ -3,7 +3,7 @@ # vim:tw=0:ts=8:sw=8:et AC_PREREQ(2.59) -AC_INIT([biosdevname],[0.6.2],[Jordan_Hargrave(a)dell.com]) +AC_INIT([biosdevname],[0.7.1],[Jordan_Hargrave(a)dell.com]) AC_LANG([C]) AC_USE_SYSTEM_EXTENSIONS AC_CONFIG_SRCDIR([src/read_proc.c]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/biosdevname-0.6.2/missing new/biosdevname-0.7.1/missing --- old/biosdevname-0.6.2/missing 2015-04-15 18:41:49.000000000 +0200 +++ new/biosdevname-0.7.1/missing 2015-12-18 17:19:26.000000000 +0100 @@ -1,10 +1,11 @@ #! /bin/sh -# Common wrapper for a few potentially missing GNU programs. +# Common stub for a few missing GNU programs while installing. -scriptversion=2012-06-26.16; # UTC +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996-2012 Free Software Foundation, Inc. -# Originally written by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. +# Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -25,40 +26,69 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try '$0 --help' for more information" + echo 1>&2 "Try \`$0 --help' for more information" exit 1 fi -case $1 in +run=: +sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p' +sed_minuso='s/.* -o $[^ ]*$.*/\1/p' + +# In the cases where this matters, `missing' is being run in the +# srcdir already. +if test -f configure.ac; then + configure_ac=configure.ac +else + configure_ac=configure.in +fi - --is-lightweight) - # Used by our autoconf macros to check whether the available missing - # script is modern enough. - exit 0 - ;; +msg="missing on your system" - --run) - # Back-compat with the calling convention used by older automake. - shift - ;; +case $1 in +--run) + # Try to run requested program, and just exit if it succeeds. + run= + shift + "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due -to PROGRAM being missing or too old. +Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an +error status if there is no known handling for PROGRAM. Options: -h, --help display this help and exit -v, --version output version information and exit + --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal autoconf autoheader autom4te automake makeinfo - bison yacc flex lex help2man + aclocal touch file \`aclocal.m4' + autoconf touch file \`configure' + autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one + automake touch all \`Makefile.in' files + bison create \`y.tab.[ch]', if possible, from existing .[ch] + flex create \`lex.yy.c', if possible, from existing .c + help2man touch the output file + lex create \`lex.yy.c', if possible, from existing .c + makeinfo touch the output file + tar try tar, gnutar, gtar, then tar without non-portable flags + yacc create \`y.tab.[ch]', if possible, from existing .[ch] -Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and -'g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. Send bug reports to <bug-automake(a)gnu.org>." exit $? @@ -70,141 +100,272 @@ ;; -*) - echo 1>&2 "$0: unknown '$1' option" - echo 1>&2 "Try '$0 --help' for more information" + echo 1>&2 "$0: Unknown \`$1' option" + echo 1>&2 "Try \`$0 --help' for more information" exit 1 ;; esac -# Run the given program, remember its exit status. -"$@"; st=$? +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). This is about non-GNU programs, so use $1 not +# $program. +case $1 in + lex*|yacc*) + # Not GNU programs, they don't have --version. + ;; -# If it succeeded, we are done. -test $st -eq 0 && exit 0 + tar*) + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; -# Also exit now if we it failed (or wasn't found), and '--version' was -# passed; such an option is passed most likely to detect whether the -# program is present and works. -case $2 in --version|--help) exit $st;; esac - -# Exit code 63 means version mismatch. This often happens when the user -# tries to use an ancient version of a tool on a file that requires a -# minimum version. -if test $st -eq 63; then - msg="probably too old" -elif test $st -eq 127; then - # Program was missing. - msg="missing on your system" -else - # Program was found and executed, but failed. Give up. - exit $st -fi + *) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 + fi + ;; +esac + +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $program in + aclocal*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`acinclude.m4' or \`${configure_ac}'. You might want + to install the \`Automake' and \`Perl' packages. Grab them from + any GNU archive site." + touch aclocal.m4 + ;; + + autoconf*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`${configure_ac}'. You might want to install the + \`Autoconf' and \`GNU m4' packages. Grab them from any GNU + archive site." + touch configure + ;; + + autoheader*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`acconfig.h' or \`${configure_ac}'. You might want + to install the \`Autoconf' and \`GNU m4' packages. Grab them + from any GNU archive site." + files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER($[^)]*$).*/\1/p' ${configure_ac}` + test -z "$files" && files="config.h" + touch_files= + for f in $files; do + case $f in + *:*) touch_files="$touch_files "`echo "$f" | + sed -e 's/^[^:]*://' -e 's/:.*//'`;; + *) touch_files="$touch_files $f.in";; + esac + done + touch $touch_files + ;; + + automake*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. + You might want to install the \`Automake' and \`Perl' packages. + Grab them from any GNU archive site." + find . -type f -name Makefile.am -print | + sed 's/\.am$/.in/' | + while read f; do touch "$f"; done + ;; + + autom4te*) + echo 1>&2 "\ +WARNING: \`$1' is needed, but is $msg. + You might have modified some files without having the + proper tools for further handling them. + You can get \`$1' as part of \`Autoconf' from any GNU + archive site." + + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then + touch $file + else + test -z "$file" || exec >$file + echo "#! /bin/sh" + echo "# Created by GNU Automake missing as a replacement of" + echo "# $ $@" + echo "exit 0" + chmod +x $file + exit 1 + fi + ;; + + bison*|yacc*) + echo 1>&2 "\ +WARNING: \`$1' $msg. You should only need it if + you modified a \`.y' file. You may need the \`Bison' package + in order for those modifications to take effect. You can get + \`Bison' from any GNU archive site." + rm -f y.tab.c y.tab.h + if test $# -ne 1; then + eval LASTARG="\${$#}" + case $LASTARG in + *.y) + SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` + if test -f "$SRCFILE"; then + cp "$SRCFILE" y.tab.c + fi + SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` + if test -f "$SRCFILE"; then + cp "$SRCFILE" y.tab.h + fi + ;; + esac + fi + if test ! -f y.tab.h; then + echo >y.tab.h + fi + if test ! -f y.tab.c; then + echo 'main() { return 0; }' >y.tab.c + fi + ;; + + lex*|flex*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified a \`.l' file. You may need the \`Flex' package + in order for those modifications to take effect. You can get + \`Flex' from any GNU archive site." + rm -f lex.yy.c + if test $# -ne 1; then + eval LASTARG="\${$#}" + case $LASTARG in + *.l) + SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` + if test -f "$SRCFILE"; then + cp "$SRCFILE" lex.yy.c + fi + ;; + esac + fi + if test ! -f lex.yy.c; then + echo 'main() { return 0; }' >lex.yy.c + fi + ;; + + help2man*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified a dependency of a manual page. You may need the + \`Help2man' package in order for those modifications to take + effect. You can get \`Help2man' from any GNU archive site." + + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then + touch $file + else + test -z "$file" || exec >$file + echo ".ab help2man is required to generate this page" + exit $? + fi + ;; + + makeinfo*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified a \`.texi' or \`.texinfo' file, or any other file + indirectly affecting the aspect of the manual. The spurious + call might also be the consequence of using a buggy \`make' (AIX, + DU, IRIX). You might want to install the \`Texinfo' package or + the \`GNU make' package. Grab either from any GNU archive site." + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -z "$file"; then + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* $[^ ]*$ *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 + touch $file + ;; + + tar*) + shift + + # We have already tried tar in the generic part. + # Look for gnutar/gtar before invocation to avoid ugly error + # messages. + if (gnutar --version > /dev/null 2>&1); then + gnutar "$@" && exit 0 + fi + if (gtar --version > /dev/null 2>&1); then + gtar "$@" && exit 0 + fi + firstarg="$1" + if shift; then + case $firstarg in + *o*) + firstarg=`echo "$firstarg" | sed s/o//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + case $firstarg in + *h*) + firstarg=`echo "$firstarg" | sed s/h//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + fi + + echo 1>&2 "\ +WARNING: I can't seem to be able to run \`tar' with the given arguments. + You may want to install GNU tar or Free paxutils, or check the + command line arguments." + exit 1 + ;; + + *) + echo 1>&2 "\ +WARNING: \`$1' is needed, and is $msg. + You might have modified some files without having the + proper tools for further handling them. Check the \`README' file, + it often tells you about the needed prerequisites for installing + this package. You may also peek at any GNU archive site, in case + some other package would contain this missing \`$1' program." + exit 1 + ;; +esac -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software - -program_details () -{ - case $1 in - aclocal|automake) - echo "The '$1' program is part of the GNU Automake package:" - echo "<$gnu_software_URL/automake>" - echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" - echo "<$gnu_software_URL/autoconf>" - echo "<$gnu_software_URL/m4/>" - echo "<$perl_URL>" - ;; - autoconf|autom4te|autoheader) - echo "The '$1' program is part of the GNU Autoconf package:" - echo "<$gnu_software_URL/autoconf/>" - echo "It also requires GNU m4 and Perl in order to run:" - echo "<$gnu_software_URL/m4/>" - echo "<$perl_URL>" - ;; - esac -} - -give_advice () -{ - # Normalize program name to check for. - normalized_program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - - printf '%s\n' "'$1' is $msg." - - configure_deps="'configure.ac' or m4 files included by 'configure.ac'" - case $normalized_program in - autoconf*) - echo "You should only need it if you modified 'configure.ac'," - echo "or m4 files included by it." - program_details 'autoconf' - ;; - autoheader*) - echo "You should only need it if you modified 'acconfig.h' or" - echo "$configure_deps." - program_details 'autoheader' - ;; - automake*) - echo "You should only need it if you modified 'Makefile.am' or" - echo "$configure_deps." - program_details 'automake' - ;; - aclocal*) - echo "You should only need it if you modified 'acinclude.m4' or" - echo "$configure_deps." - program_details 'aclocal' - ;; - autom4te*) - echo "You might have modified some maintainer files that require" - echo "the 'automa4te' program to be rebuilt." - program_details 'autom4te' - ;; - bison*|yacc*) - echo "You should only need it if you modified a '.y' file." - echo "You may want to install the GNU Bison package:" - echo "<$gnu_software_URL/bison/>" - ;; - lex*|flex*) - echo "You should only need it if you modified a '.l' file." - echo "You may want to install the Fast Lexical Analyzer package:" - echo "<$flex_URL>" - ;; - help2man*) - echo "You should only need it if you modified a dependency" \ - "of a man page." - echo "You may want to install the GNU Help2man package:" - echo "<$gnu_software_URL/help2man/>" - ;; - makeinfo*) - echo "You should only need it if you modified a '.texi' file, or" - echo "any other file indirectly affecting the aspect of the manual." - echo "You might want to install the Texinfo package:" - echo "<$gnu_software_URL/texinfo/>" - echo "The spurious makeinfo call might also be the consequence of" - echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" - echo "want to install GNU make:" - echo "<$gnu_software_URL/make/>" - ;; - *) - echo "You might have modified some files without having the proper" - echo "tools for further handling them. Check the 'README' file, it" - echo "often tells you about the needed prerequisites for installing" - echo "this package. You may also peek at any GNU archive site, in" - echo "case some other package contains this missing '$1' program." - ;; - esac -} - -give_advice "$1" | sed -e '1s/^/WARNING: /' \ - -e '2,$s/^/ /' >&2 - -# Propagate the correct exit status (expected to be 127 for a program -# not found, 63 for a program that failed due to version mismatch). -exit $st +exit 0 # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/biosdevname-0.6.2/src/bios_dev_name.h new/biosdevname-0.7.1/src/bios_dev_name.h --- old/biosdevname-0.6.2/src/bios_dev_name.h 2015-04-15 18:42:30.000000000 +0200 +++ new/biosdevname-0.7.1/src/bios_dev_name.h 2015-12-18 17:25:10.000000000 +0100 @@ -6,7 +6,7 @@ #ifndef GLUE_H_INCLUDED #define GLUE_H_INCLUDED -#define BIOSDEVNAME_VERSION "0.6.2" +#define BIOSDEVNAME_VERSION "0.7.1" struct bios_dev_name_opts { int argc; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/biosdevname-0.6.2/src/bios_device.c new/biosdevname-0.7.1/src/bios_device.c --- old/biosdevname-0.6.2/src/bios_device.c 2014-11-19 17:04:18.000000000 +0100 +++ new/biosdevname-0.7.1/src/bios_device.c 2015-12-18 17:18:52.000000000 +0100 @@ -21,6 +21,7 @@ return; list_for_each_entry_safe(dev, n, &state->bios_devices, node) { list_del(&(dev->node)); + free(dev->bios_name); free(dev); } } @@ -138,6 +139,7 @@ if (x->pcidev && !y->pcidev) return -1; else if (!x->pcidev && y->pcidev) return 1; + else if (!x->pcidev && !y->pcidev) return 0; a = x->pcidev; b = y->pcidev; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/biosdevname-0.6.2/src/dmidecode/util.c new/biosdevname-0.7.1/src/dmidecode/util.c --- old/biosdevname-0.6.2/src/dmidecode/util.c 2014-11-03 19:07:11.000000000 +0100 +++ new/biosdevname-0.7.1/src/dmidecode/util.c 2015-12-18 17:10:29.000000000 +0100 @@ -111,6 +111,7 @@ if((p=malloc(len))==NULL) { perror("malloc"); + close(fd); return NULL; } @@ -129,6 +130,7 @@ if(mmp==MAP_FAILED) { free(p); + close(fd); return NULL; } @@ -145,18 +147,21 @@ fprintf(stderr, "%s: ", devmem); perror("lseek"); free(p); + close(fd); return NULL; } if(myread(fd, p, len, devmem)==-1) { free(p); + close(fd); return NULL; } #endif /* USE_MMAP */ if(close(fd)==-1) perror(devmem); - + + close(fd); return p; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/biosdevname-0.6.2/src/eths.c new/biosdevname-0.7.1/src/eths.c --- old/biosdevname-0.6.2/src/eths.c 2014-11-19 17:04:18.000000000 +0100 +++ new/biosdevname-0.7.1/src/eths.c 2015-12-18 17:10:29.000000000 +0100 @@ -198,6 +198,7 @@ /* Open control socket. */ fd = socket(AF_INET, SOCK_DGRAM, 0); if (fd < 0) { + free(permaddr); perror("Cannot get control socket"); return 1; } @@ -208,6 +209,7 @@ err = ioctl(fd, SIOCETHTOOL, &ifr); if (err < 0) { close(fd); + free(permaddr); return err; } memcpy(buf, permaddr->data, min(permaddr->size, size)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/biosdevname-0.6.2/src/pci.c new/biosdevname-0.7.1/src/pci.c --- old/biosdevname-0.6.2/src/pci.c 2015-04-15 18:37:58.000000000 +0200 +++ new/biosdevname-0.7.1/src/pci.c 2015-12-18 17:10:29.000000000 +0100 @@ -30,6 +30,7 @@ /* Borrowed from kernel vpd code */ #define PCI_VPD_LRDT 0x80 #define PCI_VPD_SRDT_END 0x78 +#define PCI_VPDI_TAG 0x82 #define PCI_VPDR_TAG 0x90 #define PCI_VPD_SRDT_LEN_MASK 0x7 @@ -37,9 +38,16 @@ #define PCI_VPD_SRDT_TAG_SIZE 1 #define PCI_VPD_INFO_FLD_HDR_SIZE 3 +struct vpd_tag +{ + char cc[2]; + u8 len; + char data[1]; +}; + static inline u16 pci_vpd_lrdt_size(const u8 *lrdt) { - return (u16)lrdt[1] + ((u16)lrdt[2] << 8L); + return (u16)lrdt[0] + ((u16)lrdt[1] << 8L); } static inline u8 pci_vpd_srdt_size(const u8* srdt) @@ -47,78 +55,41 @@ return (*srdt) & PCI_VPD_SRDT_LEN_MASK; } -static inline u8 pci_vpd_info_field_size(const u8 *info_field) -{ - return info_field[2]; -} - -static int pci_vpd_size(struct pci_device *pdev, int fd) -{ - uint8_t buf[3], tag; - int off; - - if (!is_pci_network(pdev)) - return 0; - off = 0; - for(;;) { - if (pread(fd, buf, 1, off) != 1) - break; - if (buf[0] & PCI_VPD_LRDT) { - tag = buf[0]; - if (pread(fd, buf, 3, off) != 3) - break; - off += PCI_VPD_LRDT_TAG_SIZE + pci_vpd_lrdt_size(buf); - } else { - tag = buf[0] & ~PCI_VPD_SRDT_LEN_MASK; - off += PCI_VPD_SRDT_TAG_SIZE + pci_vpd_srdt_size(buf); - } - if (tag == 0 || tag == 0xFF || tag == PCI_VPD_SRDT_END || tag == PCI_VPDR_TAG) - break; - } - return off; -} - -static int pci_vpd_find_tag(const u8 *buf, unsigned int off, unsigned int len, u8 rdt) -{ - int i; - - for (i = off; i < len;) { - u8 val = buf[i]; - - if (val & PCI_VPD_LRDT) { - if (i + PCI_VPD_LRDT_TAG_SIZE > len) - break; - if (val == rdt) - return i; - i += PCI_VPD_LRDT_TAG_SIZE + pci_vpd_lrdt_size(&buf[i]); - } else { - u8 tag = val & ~PCI_VPD_SRDT_LEN_MASK; - - if (tag == rdt) - return i; - if (tag == PCI_VPD_SRDT_END) - break; - i += PCI_VPD_SRDT_TAG_SIZE + pci_vpd_srdt_size(&buf[i]); - } - } - return -1; -} - -/* Search for matching key/subkey in the VPD data */ -static int pci_vpd_find_info_subkey(const u8 *buf, unsigned int off, unsigned int len, - const char *kw, const char *skw) +static int pci_vpd_readtag(int fd, int *len) { - int i; + u8 tag, tlen[2]; - for (i = off; i + PCI_VPD_INFO_FLD_HDR_SIZE <= off+len;) { - /* Match key and subkey names, can use * for regex */ - if ((kw[0] == '*' || buf[i+0] == kw[0]) && - (kw[1] == '*' || buf[i+1] == kw[1]) && - (skw[0] == '*' || !memcmp(&buf[i+3], skw, 3))) - return i; - i += PCI_VPD_INFO_FLD_HDR_SIZE + pci_vpd_info_field_size(&buf[i]); - } - return -1; + if (read(fd, &tag, 1) != 1) + return -1; + if (tag == 0x00 || tag == 0xFF || tag == 0x7F) + return -1; + if (tag & PCI_VPD_LRDT) { + if (read(fd, tlen, 2) != 2) + return -1; + *len = pci_vpd_lrdt_size(tlen); + /* Check length of VPD-R */ + if (*len >= 1024) + return -1; + return tag; + } + *len = pci_vpd_srdt_size(&tag); + return (tag & ~0x7); +} + +static void *pci_vpd_findtag(void *buf, int len, const char *sig) +{ + int off, siglen; + struct vpd_tag *t; + + off = 0; + siglen = strlen(sig); + while (off < len) { + t = (struct vpd_tag *)((u8 *)buf + off); + if (!memcmp(t->data, sig, siglen)) + return t; + off += (t->len + 3); + } + return NULL; } /* Add port identifier(s) to PCI device */ @@ -140,24 +111,35 @@ list_add_tail(&p->node, &pdev->ports); } -static void parse_dcm(struct libbiosdevname_state *state, int seg, int bus, - const char *dcm, int len) +static void parse_dcm(struct libbiosdevname_state *state, struct pci_device *pdev, + void *vpd, int len) { - int i; - int port, devfn, pfi; + int i, port, devfn, pfi, step; struct pci_device *vf; + struct vpd_tag *dcm; + const char *fmt; - for (i=3; i<len; ) { - if (!strncmp(dcm, "DCM", 3)) { - sscanf(dcm+i, "%1x%1x%2x", &port, &devfn, &pfi); - i += 10; - } else if (!strncmp(dcm, "DC2", 3)) { - sscanf(dcm+i, "%1x%2x%2x", &port, &devfn, &pfi); - i += 11; - } else { + fmt = "%1x%1x%2x"; + step = 10; + dcm = pci_vpd_findtag(vpd, len, "DCM"); + if (dcm == NULL) { + dcm = pci_vpd_findtag(vpd, len, "DC2"); + if (dcm == NULL) + return; + fmt = "%1x%2x%2x"; + step = 11; + } + for (i = 3; i < dcm->len; i += step) { + if (i+step > dcm->len) { + /* DCM is truncated */ return; } - if ((vf = find_pci_dev_by_pci_addr(state, seg, bus, devfn>>3, devfn & 7)) != NULL) { + if (sscanf(dcm->data+i, fmt, &port, &devfn, &pfi) != 3) + break; + vf = find_pci_dev_by_pci_addr(state, pdev->pci_dev->domain, + pdev->pci_dev->bus, + devfn >> 3, devfn & 7); + if (vf != NULL) { add_port(vf, port, pfi); if (vf->vpd_port == INT_MAX) { vf->vpd_port = port; @@ -167,66 +149,40 @@ } } -static int parse_vpd(struct libbiosdevname_state *state, struct pci_device *pdev, int len, unsigned char *vpd) -{ - int i, j, isz, jsz; - - i = pci_vpd_find_tag(vpd, 0, len, PCI_VPDR_TAG); - if (i < 0) - return 1; - isz = pci_vpd_lrdt_size(&vpd[i]); - i += PCI_VPD_LRDT_TAG_SIZE; - - /* Lookup Version */ - j = pci_vpd_find_info_subkey(vpd, i, isz, "**", "DSV"); - if (j < 0) - return 1; - jsz = pci_vpd_info_field_size(&vpd[j]); - j += PCI_VPD_INFO_FLD_HDR_SIZE; - if ((memcmp(vpd+j+3, "1028VPDR.VER1.0", 15)) && - (memcmp(vpd+j+3, "1028VPDR.VER2.0", 15))) - return 1; - - /* Lookup Port Mappings */ - j = pci_vpd_find_info_subkey(vpd, i, isz, "**", "DC2"); - if (j < 0) { - j = pci_vpd_find_info_subkey(vpd, i, isz, "**", "DCM"); - if (j < 0) - return 1; - } - jsz = pci_vpd_info_field_size(&vpd[j]); - j += PCI_VPD_INFO_FLD_HDR_SIZE; - - parse_dcm(state, pdev->pci_dev->domain, pdev->pci_dev->bus, - (char *)vpd+j, jsz); - return 0; -} - /* Read and parse PCI VPD section if it exists */ static int read_pci_vpd(struct libbiosdevname_state *state, struct pci_device *pdev) { char path[PATH_MAX]; char pci_name[16]; - int fd, rc=1; + int fd, len; unsigned char *vpd; - off_t size; - ssize_t nrd; + if (!is_pci_network(pdev)) + return 1; unparse_pci_name(pci_name, sizeof(pci_name), pdev->pci_dev); - snprintf(path, sizeof(path), "/sys/bus/pci/devices/%s/vpd", pci_name); - if ((fd = open(path, O_RDONLY|O_SYNC)) >= 0) { - size = pci_vpd_size(pdev, fd); - if (size > 0) { - vpd = malloc(size); - if (vpd != NULL) { - if ((nrd = pread(fd, vpd, size, 0)) > 0) - rc = parse_vpd(state, pdev, nrd, vpd); - free(vpd); - } - } - close(fd); + snprintf(path, sizeof(path), "/sys/bus/pci/devices/%s/physfn/vpd", pci_name); + fd = open(path, O_RDONLY|O_SYNC); + if (fd < 0) { + snprintf(path, sizeof(path), "/sys/bus/pci/devices/%s/vpd", pci_name); + fd = open(path, O_RDONLY|O_SYNC); + if (fd < 0) + return 1; } - return rc; + if (pci_vpd_readtag(fd, &len) != PCI_VPDI_TAG) + goto done; + lseek(fd, len, SEEK_CUR); + if (pci_vpd_readtag(fd, &len) != PCI_VPDR_TAG) + goto done; + vpd = alloca(len); + if (read(fd, vpd, len) != len) + goto done; + /* Check for DELL VPD tag */ + if (!pci_vpd_findtag(vpd, len, "DSV1028VPDR.VER")) + goto done; + parse_dcm(state, pdev, vpd, len); + done: + close(fd); + return 0; } static void set_pci_vpd_instance(struct libbiosdevname_state *state) @@ -254,6 +210,10 @@ if (dev->pci_dev->vendor_id == 0x1969 || dev->pci_dev->vendor_id == 0x168c) continue; + if (dev->vpd_port != INT_MAX) { + /* Ignore already parsed devices */ + continue; + } read_pci_vpd(state, dev); } @@ -636,7 +596,7 @@ snprintf(path, sizeof(path), "/sys/bus/pci/devices/%s/%s", pci_name, virtpath); memset(cpath, 0, sizeof(cpath)); - if (readlink(path, cpath, sizeof(cpath)) < 0) + if (readlink(path, cpath, sizeof(cpath) - 1) < 0) return; if ((vf = find_dev_by_pci_name(state, cpath)) != NULL) { vf->is_sriov_virtual_function = 1; @@ -789,7 +749,7 @@ "SATA Controller", "SAS Controller", }; - if (type > 0 && type <= sizeof(msg)) + if (type > 0 && type <= (sizeof(msg)/sizeof(msg[0]))) s += snprintf(s, size-(s-buf), "%s\n", msg[type-1]); else s += snprintf(s, size-(s-buf), "<OUT OF SPEC>\n"); ++++++ biosdevname-pic.patch ++++++ --- /var/tmp/diff_new_pack.tF4W01/_old 2016-01-30 11:34:23.000000000 +0100 +++ /var/tmp/diff_new_pack.tF4W01/_new 2016-01-30 11:34:23.000000000 +0100 @@ -1,7 +1,7 @@ -Index: biosdevname-0.6.2/src/bios_dev_name.c +Index: biosdevname-0.7.1/src/bios_dev_name.c =================================================================== ---- biosdevname-0.6.2.orig/src/bios_dev_name.c -+++ biosdevname-0.6.2/src/bios_dev_name.c +--- biosdevname-0.7.1.orig/src/bios_dev_name.c ++++ biosdevname-0.7.1/src/bios_dev_name.c @@ -114,10 +114,21 @@ static u_int32_t cpuid (u_int32_t eax, u_int32_t ecx) { ++++++ udev-rule-path.patch ++++++ --- /var/tmp/diff_new_pack.tF4W01/_old 2016-01-30 11:34:23.000000000 +0100 +++ /var/tmp/diff_new_pack.tF4W01/_new 2016-01-30 11:34:23.000000000 +0100 @@ -1,8 +1,8 @@ -Index: biosdevname-0.6.1/configure.ac +Index: biosdevname-0.7.1/configure.ac =================================================================== ---- biosdevname-0.6.1.orig/configure.ac 2014-12-01 16:05:47.000000000 +0100 -+++ biosdevname-0.6.1/configure.ac 2015-01-22 13:24:22.231621837 +0100 -@@ -66,20 +66,9 @@ +--- biosdevname-0.7.1.orig/configure.ac ++++ biosdevname-0.7.1/configure.ac +@@ -66,20 +66,9 @@ AC_FUNC_STAT AC_FUNC_VPRINTF AC_CHECK_FUNCS([dup2 gettimeofday memset munmap select socket strcasecmp strchr strdup strerror strncasecmp strpbrk strrchr strstr strtol strtoul]) @@ -26,11 +26,11 @@ RULEDIR=$(dirname $RULEDEST) AC_SUBST(RULEDEST, $RULEDEST) AC_SUBST(RULEDIR, $RULEDIR) -Index: biosdevname-0.6.1/configure +Index: biosdevname-0.7.1/configure =================================================================== ---- biosdevname-0.6.1.orig/configure 2014-12-01 16:06:21.000000000 +0100 -+++ biosdevname-0.6.1/configure 2015-01-22 13:48:51.915645203 +0100 -@@ -7305,18 +7305,7 @@ +--- biosdevname-0.7.1.orig/configure ++++ biosdevname-0.7.1/configure +@@ -10560,18 +10560,7 @@ done # this is ugly, but accounts for SLES 10, Red Hat/Fedora, and Ubuntu # handles default udev rules as of udev 114 or thereabouts

1 0

commit fuse for openSUSE:Factory
by root＠hilbert.suse.de 30 Jan '16

30 Jan '16

Hello community, here is the log from the commit of package fuse for openSUSE:Factory checked in at 2016-01-30 11:34:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fuse (Old) and /work/SRC/openSUSE:Factory/.fuse.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fuse" Changes: -------- --- /work/SRC/openSUSE:Factory/fuse/fuse.changes 2015-05-23 12:50:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fuse.new/fuse.changes 2016-01-30 11:34:17.000000000 +0100 @@ -1,0 +2,9 @@ +Fri Jan 22 12:04:12 UTC 2016 - astieger(a)suse.com + +- fuse 2.9.5: + * fix warning in mount.c:receive_fd(). + * fix possible memory leak. + * new upstream project and source URL + * add new maintainer keyring and verify source signature + +------------------------------------------------------------------- Old: ---- fuse-2.9.4.tar.gz New: ---- fuse-2.9.5.tar.gz fuse-2.9.5.tar.gz.asc fuse.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fuse.spec ++++++ --- /var/tmp/diff_new_pack.XN3HkZ/_old 2016-01-30 11:34:18.000000000 +0100 +++ /var/tmp/diff_new_pack.XN3HkZ/_new 2016-01-30 11:34:18.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package fuse # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX 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,35 +16,38 @@ # +%define tag 2_9_5 Name: fuse +Version: 2.9.5 +Release: 0 Summary: User space File System License: GPL-2.0+ and LGPL-2.1+ Group: System/Filesystems -Version: 2.9.4 -Release: 0 -# http://downloads.sf.net/fuse/fuse-%%version.tar.gz -Source: http://downloads.sourceforge.net/project/fuse/fuse-2.X/%{version}/%{name}-%… +Url: https://github.com/libfuse/libfuse +Source: https://github.com/libfuse/libfuse/releases/download/fuse_%{tag}/fuse-%{ver… Source2: fuse.rpmlintrc Source3: baselibs.conf Source4: fuse.conf -Patch: fuse-install-fix.diff +Source5: https://github.com/libfuse/libfuse/releases/download/fuse_%{tag}/fuse-%{ver… +Source6: fuse.keyring +Patch0: fuse-install-fix.diff Patch3: fusermount-compile-as-pie.patch Patch4: aarch64-build-fix.patch -Url: http://fuse.sourceforge.net +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool +BuildRequires: pkgconfig +# FIXME: use proper Requires(pre/post/preun/...) +PreReq: permissions BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1130 Requires: util-linux >= 2.18 %else Requires: util-linux(fake+no-canonicalize) %endif -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: libtool -BuildRequires: pkgconfig %if 0%{?suse_version} >= 1000 Supplements: filesystem(fuse) %endif -PreReq: permissions %description With FUSE, a user space program can export a file system through the @@ -138,12 +141,12 @@ %prep %setup -q -%patch -p1 +%patch0 -p1 %patch3 -p1 %patch4 %build -export CFLAGS="$RPM_OPT_FLAGS -g -fno-strict-aliasing" +export CFLAGS="%{optflags} -g -fno-strict-aliasing" export MOUNT_FUSE_PATH=%{_sbindir} autoreconf -fi %configure --with-pic \ @@ -154,30 +157,30 @@ make %{?_smp_mflags} %install -%makeinstall -rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/init.d -install -m644 -D %{S:4} $RPM_BUILD_ROOT/%{_sysconfdir}/fuse.conf +make DESTDIR=%{buildroot} install %{?_smp_mflags} +rm -rf %{buildroot}/%{_sysconfdir}/init.d +install -m644 -D %{SOURCE4} %{buildroot}/%{_sysconfdir}/fuse.conf # Needed for OpenSUSE buildservice -%if %suse_version <= 1020 -install -m644 -D util/udev.rules $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/99-fuse.rules +%if 0%{?suse_version} <= 1020 +install -m644 -D util/udev.rules %{buildroot}/%{_sysconfdir}/udev/rules.d/99-fuse.rules %endif -%{__rm} -f %{buildroot}%{_libdir}/*.la +find %{buildroot} -type f -name "*.la" -delete -print # not needed for fuse, might reappar in separate package: -%{__rm} -f %{buildroot}/%{_libdir}/libulockmgr.a +rm -f %{buildroot}/%{_libdir}/libulockmgr.a #UsrMerge -mkdir $RPM_BUILD_ROOT/sbin -mkdir $RPM_BUILD_ROOT/%{_lib} -%{__ln_s} -v %{_sbindir}/mount.fuse $RPM_BUILD_ROOT/sbin -pushd $RPM_BUILD_ROOT/%{_libdir} +mkdir %{buildroot}/sbin +mkdir %{buildroot}/%{_lib} +ln -s -v %{_sbindir}/mount.fuse %{buildroot}/sbin +pushd %{buildroot}/%{_libdir} for libname in $(ls *.so.*);do -%{__ln_s} -v /%{_libdir}/$libname %{buildroot}/%{_lib} +ln -s -v /%{_libdir}/$libname %{buildroot}/%{_lib} done popd #EndUsrMerge -(cd example && %{__make} clean) -%{__rm} -rf example/.deps example/Makefile.am example/Makefile.in -%{__rm} -rf doc/Makefile.am doc/Makefile.in doc/Makefile +(cd example && make clean) +rm -rf example/.deps example/Makefile.am example/Makefile.in +rm -rf doc/Makefile.am doc/Makefile.in doc/Makefile %post %if 0%{?suse_version} >= 1140 @@ -185,6 +188,7 @@ %else %run_permissions %endif + %verifyscript %verify_permissions -e %{_bindir}/fusermount @@ -198,8 +202,8 @@ %files %defattr(-,root,root) -%doc AUTHORS ChangeLog FAQ NEWS README* COPYING* -%if %suse_version <= 1020 +%doc AUTHORS ChangeLog NEWS README* COPYING* +%if 0%{?suse_version} <= 1020 %dir %{_sysconfdir}/udev %dir %{_sysconfdir}/udev/rules.d %{_sysconfdir}/udev/rules.d/99-fuse.rules ++++++ fuse-2.9.4.tar.gz -> fuse-2.9.5.tar.gz ++++++ ++++ 3875 lines of diff (skipped)

1 0

commit pinentry for openSUSE:Factory
by root＠hilbert.suse.de 30 Jan '16

30 Jan '16

Hello community, here is the log from the commit of package pinentry for openSUSE:Factory checked in at 2016-01-30 11:34:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pinentry (Old) and /work/SRC/openSUSE:Factory/.pinentry.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pinentry" Changes: -------- --- /work/SRC/openSUSE:Factory/pinentry/pinentry.changes 2016-01-20 09:54:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pinentry.new/pinentry.changes 2016-01-30 11:34:12.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Jan 20 08:49:48 UTC 2016 - astieger(a)suse.com + +- completely rename to qt5 [boo#962076] +- fix self-deprecation rpmlint warning + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pinentry.spec ++++++ --- /var/tmp/diff_new_pack.t1EGao/_old 2016-01-30 11:34:14.000000000 +0100 +++ /var/tmp/diff_new_pack.t1EGao/_new 2016-01-30 11:34:14.000000000 +0100 @@ -60,7 +60,7 @@ Provides: pinentry-qt = %{version} Obsoletes: pinentry-qt <= 0.8.3 Provides: pinentry-qt4 = %{version} -Obsoletes: pinentry-qt4 <= 0.9.7 +Obsoletes: pinentry-qt4 < 0.9.7 %description qt5 This is a collection of simple PIN or passphrase entry dialogs which @@ -156,7 +156,8 @@ # remove symlink rm -rf %{buildroot}%{_bindir}/pinentry -# backward compatibility symlink +# backward compatibility symlinks +ln -s pinentry-qt %{buildroot}%{_bindir}/pinentry-qt5 ln -s pinentry-qt %{buildroot}%{_bindir}/pinentry-qt4 cp %{SOURCE3} %{buildroot}%{_bindir} @@ -176,6 +177,7 @@ %files qt5 %defattr(-,root,root) +%attr(755,root,root) %{_bindir}/pinentry-qt5 %attr(755,root,root) %{_bindir}/pinentry-qt4 %attr(755,root,root) %{_bindir}/pinentry-qt ++++++ pinentry ++++++ --- /var/tmp/diff_new_pack.t1EGao/_old 2016-01-30 11:34:14.000000000 +0100 +++ /var/tmp/diff_new_pack.t1EGao/_new 2016-01-30 11:34:14.000000000 +0100 @@ -15,7 +15,7 @@ # Boris Ranto <branto(a)redhat.com> 2014 # Andreas Stieger <andreas.stieger(a)gmx.de> 2014 # -# use proper binary (pinentry-qt4, pinentry-qt, pinentry-gtk-2 or pinentry-curses) +# use proper binary (pinentry-qt5, pinentry-qt, pinentry-gtk-2 or pinentry-curses) kde_running= arg= @@ -56,10 +56,10 @@ if [ -n "$PINENTRY_BINARY" ]; then export PINENTRY_BINARY="$PINENTRY_BINARY" -# if KDE is detected and pinentry-qt4 exists, use pinentry-qt4 -elif [ -n "$kde_running" -a "$kde_ver"x = 4x -a -x /usr/bin/pinentry-qt4 ] +# if KDE is detected and pinentry-qt5 exists, use pinentry-qt5 +elif [ -n "$kde_running" -a "$kde_ver"x = 4x -a -x /usr/bin/pinentry-qt5 ] then - export PINENTRY_BINARY="/usr/bin/pinentry-qt4" + export PINENTRY_BINARY="/usr/bin/pinentry-qt5" # if KDE is detected and pinentry-qt exists, use pinentry-qt elif [ -n "$kde_running" -a -x /usr/bin/pinentry-qt ] then @@ -72,10 +72,10 @@ elif [ -n "$DISPLAY" -a -x /usr/bin/pinentry-gtk-2 ] then export PINENTRY_BINARY="/usr/bin/pinentry-gtk-2" -# otherwise test if pinentry-qt4 exists although KDE is not detected -elif [ -n "$DISPLAY" -a -x /usr/bin/pinentry-qt4 ] +# otherwise test if pinentry-qt5 exists although KDE is not detected +elif [ -n "$DISPLAY" -a -x /usr/bin/pinentry-qt5 ] then - export PINENTRY_BINARY="/usr/bin/pinentry-qt4" + export PINENTRY_BINARY="/usr/bin/pinentry-qt5" # otherwise test if pinentry-qt exists although KDE is not detected elif [ -n "$DISPLAY" -a -x /usr/bin/pinentry-qt ] then

1 0

commit babl for openSUSE:Factory
by root＠hilbert.suse.de 30 Jan '16

30 Jan '16

Hello community, here is the log from the commit of package babl for openSUSE:Factory checked in at 2016-01-30 11:34:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/babl (Old) and /work/SRC/openSUSE:Factory/.babl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "babl" Changes: -------- --- /work/SRC/openSUSE:Factory/babl/babl.changes 2015-02-16 07:36:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.babl.new/babl.changes 2016-01-30 11:34:09.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Nov 26 03:30:16 UTC 2015 - zaitor(a)opensuse.org + +- Update to version 0.1.14: + + sRGB precision tuning + + Stability fixes + + Locale fix for setting error tolerance. + +------------------------------------------------------------------- Old: ---- babl-0.1.12.tar.bz2 New: ---- babl-0.1.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ babl.spec ++++++ --- /var/tmp/diff_new_pack.SkRpxR/_old 2016-01-30 11:34:09.000000000 +0100 +++ /var/tmp/diff_new_pack.SkRpxR/_new 2016-01-30 11:34:09.000000000 +0100 @@ -16,10 +16,9 @@ # - Name: babl Url: http://gegl.org/babl/ -Version: 0.1.12 +Version: 0.1.14 Release: 0 Summary: Dynamic Pixel Format Translation Library License: LGPL-3.0+ @@ -94,7 +93,7 @@ %files -n libbabl-0_1-0 %defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog NEWS README TODO +%doc AUTHORS COPYING NEWS README TODO %{_libdir}/*.so.* %{_libdir}/babl-0.1/ ++++++ babl-0.1.12.tar.bz2 -> babl-0.1.14.tar.bz2 ++++++ ++++ 15776 lines of diff (skipped)

1 0

commit crash for openSUSE:Factory
by root＠hilbert.suse.de 30 Jan '16

30 Jan '16

Hello community, here is the log from the commit of package crash for openSUSE:Factory checked in at 2016-01-30 11:31:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/crash (Old) and /work/SRC/openSUSE:Factory/.crash.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "crash" Changes: -------- --- /work/SRC/openSUSE:Factory/crash/crash.changes 2015-09-13 09:45:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.crash.new/crash.changes 2016-01-30 11:31:52.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Jan 28 16:22:27 UTC 2016 - vbabka(a)suse.com + +- Upgrade to 7.1.4 from upstream. For a detailed changelog see + + http://people.redhat.com/anderson/crash.changelog.html + +------------------------------------------------------------------- Old: ---- crash-7.1.3.tar.gz New: ---- crash-7.1.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crash.spec ++++++ --- /var/tmp/diff_new_pack.a9sSDc/_old 2016-01-30 11:31:53.000000000 +0100 +++ /var/tmp/diff_new_pack.a9sSDc/_new 2016-01-30 11:31:53.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package crash # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -46,7 +46,7 @@ Summary: Crash utility for live systems; netdump, diskdump, LKCD or mcore dumpfiles License: GPL-3.0+ and GFDL-1.2 Group: Development/Tools/Debuggers -Version: 7.1.3 +Version: 7.1.4 Release: 0 Source: %{name}-%{version}.tar.gz Source2: crash_whitepaper-%{whitepaper_version}.tar.bz2 ++++++ crash-7.1.3.tar.gz -> crash-7.1.4.tar.gz ++++++ /work/SRC/openSUSE:Factory/crash/crash-7.1.3.tar.gz /work/SRC/openSUSE:Factory/.crash.new/crash-7.1.4.tar.gz differ: char 5, line 1

1 0

commit ghc-adjunctions for openSUSE:Factory
by root＠hilbert.suse.de 30 Jan '16

30 Jan '16

Hello community, here is the log from the commit of package ghc-adjunctions for openSUSE:Factory checked in at 2016-01-30 11:31:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-adjunctions (Old) and /work/SRC/openSUSE:Factory/.ghc-adjunctions.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-adjunctions" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-adjunctions/ghc-adjunctions.changes 2015-10-06 13:24:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-adjunctions.new/ghc-adjunctions.changes 2016-01-30 11:31:49.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Jan 26 07:58:32 UTC 2016 - mimi.vx(a)gmail.com + +- update to 4.3 +* Removed a spurious superclass constraint for Applicative (StoreT g w) +* comonad 5 support + +------------------------------------------------------------------- Old: ---- adjunctions-4.2.2.tar.gz New: ---- adjunctions-4.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-adjunctions.spec ++++++ --- /var/tmp/diff_new_pack.8r7GIm/_old 2016-01-30 11:31:50.000000000 +0100 +++ /var/tmp/diff_new_pack.8r7GIm/_new 2016-01-30 11:31:50.000000000 +0100 @@ -19,7 +19,7 @@ %global pkg_name adjunctions Name: ghc-adjunctions -Version: 4.2.2 +Version: 4.3 Release: 0 Summary: Adjunctions and representable functors License: BSD-2-Clause @@ -44,6 +44,7 @@ BuildRequires: ghc-semigroups-devel BuildRequires: ghc-tagged-devel BuildRequires: ghc-transformers-devel +BuildRequires: ghc-transformers-compat-devel BuildRequires: ghc-void-devel # End cabal-rpm deps ++++++ adjunctions-4.2.2.tar.gz -> adjunctions-4.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/adjunctions-4.2.2/.travis.yml new/adjunctions-4.3/.travis.yml --- old/adjunctions-4.2.2/.travis.yml 2015-09-14 01:15:18.000000000 +0200 +++ new/adjunctions-4.3/.travis.yml 2016-01-17 03:21:47.000000000 +0100 @@ -13,12 +13,12 @@ matrix: include: - - env: CABALVER=1.16 GHCVER=7.4.2 + - env: CABALVER=1.24 GHCVER=7.4.2 compiler: ": #GHC 7.4.2" - addons: {apt: {packages: [cabal-install-1.16,ghc-7.4.2,alex-3.1.4,happy-1.19.5], sources: [hvr-ghc]}} - - env: CABALVER=1.16 GHCVER=7.6.3 + addons: {apt: {packages: [cabal-install-1.24,ghc-7.4.2,alex-3.1.4,happy-1.19.5], sources: [hvr-ghc]}} + - env: CABALVER=1.24 GHCVER=7.6.3 compiler: ": #GHC 7.6.3" - addons: {apt: {packages: [cabal-install-1.16,ghc-7.6.3,alex-3.1.4,happy-1.19.5], sources: [hvr-ghc]}} + addons: {apt: {packages: [cabal-install-1.24,ghc-7.6.3,alex-3.1.4,happy-1.19.5], sources: [hvr-ghc]}} - env: CABALVER=1.18 GHCVER=7.8.4 compiler: ": #GHC 7.8.4" addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4,alex-3.1.4,happy-1.19.5], sources: [hvr-ghc]}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/adjunctions-4.2.2/CHANGELOG.markdown new/adjunctions-4.3/CHANGELOG.markdown --- old/adjunctions-4.2.2/CHANGELOG.markdown 2015-09-14 01:15:18.000000000 +0200 +++ new/adjunctions-4.3/CHANGELOG.markdown 2016-01-17 03:21:47.000000000 +0100 @@ -1,3 +1,9 @@ +4.3 +--- +* Removed a spurious superclass constraint for `Applicative (StoreT g w)` +* GHC 8 support +* `comonad` 5 support + 4.2.2 ----- * Builds clean on GHC 7.10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/adjunctions-4.2.2/adjunctions.cabal new/adjunctions-4.3/adjunctions.cabal --- old/adjunctions-4.2.2/adjunctions.cabal 2015-09-14 01:15:18.000000000 +0200 +++ new/adjunctions-4.3/adjunctions.cabal 2016-01-17 03:21:47.000000000 +0100 @@ -1,6 +1,6 @@ name: adjunctions category: Data Structures, Adjunctions -version: 4.2.2 +version: 4.3 license: BSD3 cabal-version: >= 1.6 license-file: LICENSE @@ -40,20 +40,21 @@ UndecidableInstances build-depends: - array >= 0.3.0.2 && < 0.7, - base >= 4 && < 5, - comonad >= 4 && < 5, - containers >= 0.3 && < 0.6, - contravariant >= 1 && < 2, - distributive >= 0.4 && < 1, - free >= 4 && < 5, - mtl >= 2.0.1 && < 2.3, - profunctors >= 4 && < 6, - tagged >= 0.7 && < 1, - semigroupoids >= 4 && < 6, - semigroups >= 0.11 && < 1, - transformers >= 0.2 && < 0.5, - void >= 0.5.5.1 && < 1 + array >= 0.3.0.2 && < 0.7, + base >= 4 && < 5, + comonad >= 4 && < 6, + containers >= 0.3 && < 0.6, + contravariant >= 1 && < 2, + distributive >= 0.4 && < 1, + free >= 4 && < 5, + mtl >= 2.0.1 && < 2.3, + profunctors >= 4 && < 6, + tagged >= 0.7 && < 1, + semigroupoids >= 4 && < 6, + semigroups >= 0.11 && < 1, + transformers >= 0.2 && < 0.6, + transformers-compat >= 0.3 && < 1, + void >= 0.5.5.1 && < 1 exposed-modules: Control.Comonad.Representable.Store diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/adjunctions-4.2.2/src/Control/Comonad/Representable/Store.hs new/adjunctions-4.3/src/Control/Comonad/Representable/Store.hs --- old/adjunctions-4.2.2/src/Control/Comonad/Representable/Store.hs 2015-09-14 01:15:18.000000000 +0200 +++ new/adjunctions-4.3/src/Control/Comonad/Representable/Store.hs 2016-01-17 03:21:47.000000000 +0100 @@ -95,7 +95,7 @@ instance (ComonadApply w, Semigroup (Rep g), Representable g) => ComonadApply (StoreT g w) where StoreT ff m <@> StoreT fa n = StoreT (apRep <$> ff <@> fa) (m <> n) -instance (Applicative w, Semigroup (Rep g), Monoid (Rep g), Representable g) => Applicative (StoreT g w) where +instance (Applicative w, Monoid (Rep g), Representable g) => Applicative (StoreT g w) where pure a = StoreT (pure (pureRep a)) mempty StoreT ff m <*> StoreT fa n = StoreT (apRep <$> ff <*> fa) (m `mappend` n) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/adjunctions-4.2.2/src/Control/Monad/Representable/Reader.hs new/adjunctions-4.3/src/Control/Monad/Representable/Reader.hs --- old/adjunctions-4.2.2/src/Control/Monad/Representable/Reader.hs 2015-09-14 01:15:18.000000000 +0200 +++ new/adjunctions-4.3/src/Control/Monad/Representable/Reader.hs 2016-01-17 03:21:47.000000000 +0100 @@ -77,7 +77,9 @@ ReaderT fm >>- f = ReaderT $ tabulate (\a -> index fm a >>- flip index a . getReaderT . f) instance (Representable f, Monad m) => Monad (ReaderT f m) where +#if __GLASGOW_HASKELL__ < 710 return = ReaderT . pureRep . return +#endif ReaderT fm >>= f = ReaderT $ tabulate (\a -> index fm a >>= flip index a . getReaderT . f) #if __GLASGOW_HASKELL >= 704 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/adjunctions-4.2.2/src/Control/Monad/Representable/State.hs new/adjunctions-4.3/src/Control/Monad/Representable/State.hs --- old/adjunctions-4.2.2/src/Control/Monad/Representable/State.hs 2015-09-14 01:15:18.000000000 +0200 +++ new/adjunctions-4.3/src/Control/Monad/Representable/State.hs 2016-01-17 03:21:47.000000000 +0100 @@ -147,7 +147,9 @@ StateT m >>- f = StateT $ fmap (>>- rightAdjunctRep (runStateT . f)) m instance (Representable g, Monad m) => Monad (StateT g m) where +#if __GLASGOW_VERSION__ < 710 return = StateT . leftAdjunctRep return +#endif StateT m >>= f = StateT $ fmap (>>= rightAdjunctRep (runStateT . f)) m instance Representable f => BindTrans (StateT f) where diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/adjunctions-4.2.2/src/Control/Monad/Trans/Adjoint.hs new/adjunctions-4.3/src/Control/Monad/Trans/Adjoint.hs --- old/adjunctions-4.2.2/src/Control/Monad/Trans/Adjoint.hs 2015-09-14 01:15:18.000000000 +0200 +++ new/adjunctions-4.3/src/Control/Monad/Trans/Adjoint.hs 2016-01-17 03:21:47.000000000 +0100 @@ -50,7 +50,7 @@ (<*>) = ap instance (Adjunction f g, Monad m) => Monad (AdjointT f g m) where - return = AdjointT . leftAdjunct return + return = pure AdjointT m >>= f = AdjointT $ fmap (>>= rightAdjunct (runAdjointT . f)) m -- | Exploiting this instance requires that we have the missing Traversables for Identity, (,)e and IdentityT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/adjunctions-4.2.2/src/Control/Monad/Trans/Contravariant/Adjoint.hs new/adjunctions-4.3/src/Control/Monad/Trans/Contravariant/Adjoint.hs --- old/adjunctions-4.2.2/src/Control/Monad/Trans/Contravariant/Adjoint.hs 2015-09-14 01:15:18.000000000 +0200 +++ new/adjunctions-4.3/src/Control/Monad/Trans/Contravariant/Adjoint.hs 2016-01-17 03:21:47.000000000 +0100 @@ -62,5 +62,5 @@ (<*>) = ap instance (Adjunction f g, Comonad w) => Monad (AdjointT f g w) where - return = AdjointT . leftAdjunct extract + return = pure AdjointT m >>= f = AdjointT $ contramap (extend (rightAdjunct (runAdjointT . f))) m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/adjunctions-4.2.2/src/Data/Functor/Adjunction.hs new/adjunctions-4.3/src/Data/Functor/Adjunction.hs --- old/adjunctions-4.2.2/src/Data/Functor/Adjunction.hs 2015-09-14 01:15:18.000000000 +0200 +++ new/adjunctions-4.3/src/Data/Functor/Adjunction.hs 2016-01-17 03:21:47.000000000 +0100 @@ -48,10 +48,10 @@ import Control.Comonad.Trans.Traced import Data.Functor.Identity -import Data.Functor.Coproduct import Data.Functor.Compose import Data.Functor.Product import Data.Functor.Rep +import Data.Functor.Sum import Data.Profunctor import Data.Void @@ -89,7 +89,7 @@ -- This can be used with the combinators from the @lens@ package. -- -- @'adjuncted' :: 'Adjunction' f u => 'Iso'' (f a -> b) (a -> u b)@ -adjuncted :: (Adjunction f u, Profunctor p, Functor g) +adjuncted :: (Adjunction f u, Profunctor p, Functor g) => p (a -> u b) (g (c -> u d)) -> p (f a -> b) (g (f c -> d)) adjuncted = dimap leftAdjunct (fmap rightAdjunct) {-# INLINE adjuncted #-} @@ -181,12 +181,10 @@ counit = rightAdjunct (rightAdjunct getCompose) . getCompose instance (Adjunction f g, Adjunction f' g') => - Adjunction (Coproduct f f') (Product g g') where - unit a = Pair (leftAdjunct left a) (leftAdjunct right a) - counit = coproduct (rightAdjunct fstP) (rightAdjunct sndP) - where - fstP (Pair x _) = x - sndP (Pair _ x) = x + Adjunction (Sum f f') (Product g g') where + unit a = Pair (leftAdjunct InL a) (leftAdjunct InR a) + counit (InL l) = rightAdjunct (\(Pair x _) -> x) l + counit (InR r) = rightAdjunct (\(Pair _ x) -> x) r instance Adjunction f u => Adjunction (Free f) (Cofree u) where diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/adjunctions-4.2.2/src/Data/Functor/Rep.hs new/adjunctions-4.3/src/Data/Functor/Rep.hs --- old/adjunctions-4.2.2/src/Data/Functor/Rep.hs 2015-09-14 01:15:18.000000000 +0200 +++ new/adjunctions-4.3/src/Data/Functor/Rep.hs 2016-01-17 03:21:47.000000000 +0100 @@ -67,12 +67,16 @@ import Control.Comonad.Cofree import Control.Monad.Trans.Identity import Control.Monad.Reader +#if MIN_VERSION_base(4,4,0) +import Data.Complex +#endif import Data.Distributive import Data.Functor.Bind import Data.Functor.Identity import Data.Functor.Compose import Data.Functor.Extend import Data.Functor.Product +import qualified Data.Monoid as Monoid import Data.Profunctor import Data.Proxy import Data.Sequence (Seq) @@ -111,7 +115,7 @@ -- This can be used with the combinators from the @lens@ package. -- -- @'tabulated' :: 'Representable' f => 'Iso'' ('Rep' f -> a) (f a)@ -tabulated :: (Representable f, Representable g, Profunctor p, Functor h) +tabulated :: (Representable f, Representable g, Profunctor p, Functor h) => p (f a) (h (g b)) -> p (Rep f -> a) (h (Rep g -> b)) tabulated = dimap tabulate (fmap index) {-# INLINE tabulated #-} @@ -227,6 +231,28 @@ k Seq.:< ks -> index (index as k) ks tabulate f = f Seq.empty :< tabulate (\k -> tabulate (f . (k Seq.<|))) +instance Representable Monoid.Dual where + type Rep Monoid.Dual = () + index (Monoid.Dual d) () = d + tabulate f = Monoid.Dual (f ()) + +instance Representable Monoid.Product where + type Rep Monoid.Product = () + index (Monoid.Product p) () = p + tabulate f = Monoid.Product (f ()) + +instance Representable Monoid.Sum where + type Rep Monoid.Sum = () + index (Monoid.Sum s) () = s + tabulate f = Monoid.Sum (f ()) + +#if MIN_VERSION_base(4,4,0) +instance Representable Complex where + type Rep Complex = Bool + index (r :+ i) key = if key then i else r + tabulate f = f False :+ f True +#endif + newtype Co f a = Co { unCo :: f a } deriving Functor instance Representable f => Representable (Co f) where @@ -248,7 +274,7 @@ (>>-) = bindRep instance Representable f => Monad (Co f) where - return = pureRep + return = pure (>>=) = bindRep #if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 704

1 0