Hello community, here is the log from the commit of package iprutils for openSUSE:Factory checked in at 2018-11-14 14:28:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/iprutils (Old) and /work/SRC/openSUSE:Factory/.iprutils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "iprutils" Wed Nov 14 14:28:55 2018 rev:62 rq:646818 version:2.4.17 Changes: -------- --- /work/SRC/openSUSE:Factory/iprutils/iprutils.changes 2018-06-13 15:15:27.345293762 +0200 +++ /work/SRC/openSUSE:Factory/.iprutils.new/iprutils.changes 2018-11-14 14:28:59.935581289 +0100 @@ -1,0 +2,10 @@ +Wed Oct 31 15:09:01 UTC 2018 - Michal Suchanek <[email protected]> + +- version update to 2.4.17 (fate#326435) + - Further show-details speedup + - Use udev activation + +- refreshed iprutils.fix_ncurses_cflags_var.patch +- fix license warning + +------------------------------------------------------------------- Old: ---- iprutils-2.4.16.1.tar.gz New: ---- iprutils-2.4.17.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iprutils.spec ++++++ --- /var/tmp/diff_new_pack.f7Czz5/_old 2018-11-14 14:29:01.555579730 +0100 +++ /var/tmp/diff_new_pack.f7Czz5/_new 2018-11-14 14:29:01.555579730 +0100 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -20,7 +20,7 @@ Name: iprutils # NOTE: package's changelog is hidden in % changelog section # in file iprutils/spec/iprutils.spec -Version: 2.4.16 +Version: 2.4.17 Release: 0 Summary: Utilities for the IBM Power Linux RAID Adapters License: CPL-1.0 @@ -48,7 +48,7 @@ %prep %setup -q -n %{name}-%{version}.%{revision} -%patch0 -p2 +%patch0 -p1 %build export CPPFLAGS="$(pkg-config ncurses form --cflags)" @@ -86,7 +86,8 @@ %service_del_postun iprupdate.service %files -%doc README LICENSE +%license LICENSE +%doc README %{_sbindir}/iprconfig %{_sbindir}/iprdump %{_sbindir}/iprupdate @@ -102,5 +103,6 @@ %{_sbindir}/rciprdump %{_sbindir}/rciprinit %{_sbindir}/rciprupdate +%{_udevrulesdir}/* %changelog ++++++ iprutils-2.4.16.1.tar.gz -> iprutils-2.4.17.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils-2.4.16.1/Makefile.am new/iprutils-2.4.17.1/Makefile.am --- old/iprutils-2.4.16.1/Makefile.am 2018-04-25 23:15:05.000000000 +0200 +++ new/iprutils-2.4.17.1/Makefile.am 2018-06-05 17:41:15.000000000 +0200 @@ -47,6 +47,7 @@ if SYSTEMD SUBDIRS += systemd +SUBDIRS += udev endif if SOSREPORT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils-2.4.16.1/Makefile.in new/iprutils-2.4.17.1/Makefile.in --- old/iprutils-2.4.16.1/Makefile.in 2018-05-08 17:22:14.000000000 +0200 +++ new/iprutils-2.4.17.1/Makefile.in 2018-10-30 15:18:34.000000000 +0100 @@ -94,7 +94,7 @@ iprinit$(EXEEXT) iprdbg$(EXEEXT) $(am__EXEEXT_1) \ $(am__EXEEXT_2) @STATIC_BUILD_TRUE@am__append_1 = iprconfig-static -@SYSTEMD_TRUE@am__append_2 = systemd +@SYSTEMD_TRUE@am__append_2 = systemd udev @IPRDUMPFMT_TRUE@am__append_3 = iprdumpfmt @IPRDUMPFMT_TRUE@am__append_4 = iprdumpfmt.8 subdir = . @@ -281,7 +281,7 @@ ETAGS = etags CTAGS = ctags CSCOPE = cscope -DIST_SUBDIRS = . init.d spec systemd +DIST_SUBDIRS = . init.d spec systemd udev DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -450,6 +450,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +udevrulesdir = @udevrulesdir@ noinst_LTLIBRARIES = libipr.la libipr_la_SOURCES = iprlib.c iprlib.h dist_sbin_SCRIPTS = iprsos diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils-2.4.16.1/configure new/iprutils-2.4.17.1/configure --- old/iprutils-2.4.16.1/configure 2018-05-08 17:22:14.000000000 +0200 +++ new/iprutils-2.4.17.1/configure 2018-10-30 15:18:34.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for iprutils 2.4.16.1. +# Generated by GNU Autoconf 2.69 for iprutils 2.4.17.1. # # Report bugs to <[email protected]>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='iprutils' PACKAGE_TARNAME='iprutils' -PACKAGE_VERSION='2.4.16.1' -PACKAGE_STRING='iprutils 2.4.16.1' +PACKAGE_VERSION='2.4.17.1' +PACKAGE_STRING='iprutils 2.4.17.1' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -648,6 +648,7 @@ initddir INITD_FALSE INITD_TRUE +udevrulesdir systemdunitdir SYSTEMD_FALSE SYSTEMD_TRUE @@ -1337,7 +1338,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures iprutils 2.4.16.1 to adapt to many kinds of systems. +\`configure' configures iprutils 2.4.17.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1407,7 +1408,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of iprutils 2.4.16.1:";; + short | recursive ) echo "Configuration of iprutils 2.4.17.1:";; esac cat <<\_ACEOF @@ -1518,7 +1519,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -iprutils configure 2.4.16.1 +iprutils configure 2.4.17.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1995,7 +1996,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by iprutils $as_me 2.4.16.1, which was +It was created by iprutils $as_me 2.4.17.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2859,7 +2860,7 @@ # Define the identity of the package. PACKAGE='iprutils' - VERSION='2.4.16.1' + VERSION='2.4.17.1' cat >>confdefs.h <<_ACEOF @@ -11481,11 +11482,6 @@ -ncurses_include=$(ncurses5-config --cflags) -if test -n ${ncurses_include}; then - CFLAGS="${CFLAGS} ${ncurses_include}" -fi - # Check whether --enable-build_static was given. if test "${enable_build_static+set}" = set; then : enableval=$enable_build_static; case "${enableval}" in @@ -11569,6 +11565,7 @@ # --with-systemd systemdunitdir='${exec_prefix}/lib/systemd/system/' +udevrulesdir='${exec_prefix}/lib/udev/rules.d/' # Check whether --with-systemd was given. if test "${with_systemd+set}" = set; then : @@ -11598,6 +11595,8 @@ systemdunitdir=${systemdunitdir} +udevrulesdir=${udevrulesdir} + # --with-initd initddir="${prefix}/etc/init.d/" @@ -12282,6 +12281,19 @@ LIBS="$save_LIBS" +ncurses_config=$(which ncurses5-config 2> /dev/null) +if ! test -n ${ncurses_config}; then + ncurses_config=$(which ncurses6-config 2> /dev/null) +fi + +if test -n ${ncurses_config}; then + ncurses_include=$(${ncurses_config} --cflags) + + if test -n "${ncurses_include}"; then + CFLAGS="${CFLAGS} ${ncurses_include}" + fi +fi + # Checks for header files. for ac_header in fcntl.h locale.h netinet/in.h nl_types.h \ paths.h stddef.h stdint.h stdlib.h string.h sys/file.h \ @@ -12449,7 +12461,7 @@ done -ac_config_files="$ac_config_files Makefile systemd/Makefile init.d/Makefile spec/Makefile" +ac_config_files="$ac_config_files Makefile systemd/Makefile init.d/Makefile spec/Makefile udev/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -13037,7 +13049,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by iprutils $as_me 2.4.16.1, which was +This file was extended by iprutils $as_me 2.4.17.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13094,7 +13106,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -iprutils config.status 2.4.16.1 +iprutils config.status 2.4.17.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -13495,6 +13507,7 @@ "systemd/Makefile") CONFIG_FILES="$CONFIG_FILES systemd/Makefile" ;; "init.d/Makefile") CONFIG_FILES="$CONFIG_FILES init.d/Makefile" ;; "spec/Makefile") CONFIG_FILES="$CONFIG_FILES spec/Makefile" ;; + "udev/Makefile") CONFIG_FILES="$CONFIG_FILES udev/Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils-2.4.16.1/configure.ac new/iprutils-2.4.17.1/configure.ac --- old/iprutils-2.4.16.1/configure.ac 2018-05-01 22:18:46.000000000 +0200 +++ new/iprutils-2.4.17.1/configure.ac 2018-10-30 15:16:14.000000000 +0100 @@ -10,7 +10,7 @@ AC_PREREQ([2.63]) # For RC releases, version should be set to 2.4.10.0.rc1, 2.4.10.0.rc2, etc. # For GA releases, version should be set to 2.4.10.1, 2.4.10.2, etc. -AC_INIT([iprutils], [2.4.16.1], [[email protected]]) +AC_INIT([iprutils], [2.4.17.1], [[email protected]]) AM_INIT_AUTOMAKE([1.9 foreign]) AC_CONFIG_MACRO_DIR([build-aux]) @@ -20,11 +20,6 @@ AC_PROG_INSTALL LT_INIT -ncurses_include=$(ncurses5-config --cflags) -if test -n ${ncurses_include}; then - CFLAGS="${CFLAGS} ${ncurses_include}" -fi - AC_ARG_ENABLE([build_static], [--enable-build-static Generate statically linked binaries], [case "${enableval}" in @@ -75,6 +70,7 @@ # --with-systemd systemdunitdir='${exec_prefix}/lib/systemd/system/' +udevrulesdir='${exec_prefix}/lib/udev/rules.d/' AC_ARG_WITH([systemd], [--without-systemd Disable systemd service files.], [case $withval in @@ -91,6 +87,7 @@ esac], [systemd=true]) AM_CONDITIONAL([SYSTEMD], [test "x${systemd}" = xtrue]) AC_SUBST(systemdunitdir, ${systemdunitdir}) +AC_SUBST(udevrulesdir, ${udevrulesdir}) # --with-initd initddir="${prefix}/etc/init.d/" @@ -137,6 +134,19 @@ AC_SUBST([IPRCONFIG_LIBS]) LIBS="$save_LIBS" +ncurses_config=$(which ncurses5-config 2> /dev/null) +if ! test -n ${ncurses_config}; then + ncurses_config=$(which ncurses6-config 2> /dev/null) +fi + +if test -n ${ncurses_config}; then + ncurses_include=$(${ncurses_config} --cflags) + + if test -n "${ncurses_include}"; then + CFLAGS="${CFLAGS} ${ncurses_include}" + fi +fi + # Checks for header files. AC_CHECK_HEADERS([fcntl.h locale.h netinet/in.h nl_types.h \ paths.h stddef.h stdint.h stdlib.h string.h sys/file.h \ @@ -159,5 +169,5 @@ socket strcasecmp strchr strncasecmp strrchr strstr \ strtol strtoul strtoull]) -AC_CONFIG_FILES([Makefile systemd/Makefile init.d/Makefile spec/Makefile]) +AC_CONFIG_FILES([Makefile systemd/Makefile init.d/Makefile spec/Makefile udev/Makefile]) AC_OUTPUT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils-2.4.16.1/init.d/Makefile.in new/iprutils-2.4.17.1/init.d/Makefile.in --- old/iprutils-2.4.16.1/init.d/Makefile.in 2018-05-08 17:22:15.000000000 +0200 +++ new/iprutils-2.4.17.1/init.d/Makefile.in 2018-10-30 15:18:34.000000000 +0100 @@ -279,6 +279,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +udevrulesdir = @udevrulesdir@ @INITD_TRUE@nodist_initd_SCRIPTS = iprdump iprinit iprupdate nodist_sysconf_DATA = iprha EXTRA_DIST = iprdump.in iprinit.in iprupdate.in iprha.in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils-2.4.16.1/iprconfig.c new/iprutils-2.4.17.1/iprconfig.c --- old/iprutils-2.4.16.1/iprconfig.c 2018-04-25 23:31:46.000000000 +0200 +++ new/iprutils-2.4.17.1/iprconfig.c 2018-06-05 15:32:28.000000000 +0200 @@ -17780,66 +17780,64 @@ char phy_loc[PHYSICAL_LOCATION_LENGTH + 1]; int times, index; - for_each_ioa(ioa) { - is_spi = ioa_is_spi(ioa); + is_spi = ioa_is_spi(ioa); - for_each_hotplug_dev(ioa, dev) { - if (ioa->sis64) - get_res_path(dev); - else - get_res_addrs(dev); + for_each_hotplug_dev(ioa, dev) { + if (ioa->sis64) + get_res_path(dev); + else + get_res_addrs(dev); + } + + for_each_ses(ioa, ses) { + times = 5; + if (strlen(ses->physical_location) == 0) + get_ses_phy_loc(ses); + while (times--) { + if (!ipr_receive_diagnostics(ses, 2, &ses_data, sizeof(ses_data))) + break; } + if (times < 0 ) continue; - for_each_ses(ioa, ses) { - times = 5; - if (strlen(ses->physical_location) == 0) - get_ses_phy_loc(ses); - while (times--) { - if (!ipr_receive_diagnostics(ses, 2, &ses_data, sizeof(ses_data))) - break; - } - if (times < 0 ) continue; + if (ipr_receive_diagnostics(ses, 1, &ses_cfg, sizeof(ses_cfg))) + continue; - if (ipr_receive_diagnostics(ses, 1, &ses_cfg, sizeof(ses_cfg))) - continue; + if (ipr_receive_diagnostics(ses, 7, &drive_data, sizeof(drive_data))) + continue; - if (ipr_receive_diagnostics(ses, 7, &drive_data, sizeof(drive_data))) - continue; + overall = ipr_get_overall_elem(&ses_data, &ses_cfg); + ses_bus = ses->scsi_dev_data->channel; + scsi_id_found = 0; - overall = ipr_get_overall_elem(&ses_data, &ses_cfg); - ses_bus = ses->scsi_dev_data->channel; - scsi_id_found = 0; + if (!is_spi && (overall->device_environment == 0)) + is_vses = 1; + else + is_vses = 0; - if (!is_spi && (overall->device_environment == 0)) - is_vses = 1; - else - is_vses = 0; + scsi_dbg(ses, "%s\n", is_vses ? "Found VSES" : "Found real SES"); - scsi_dbg(ses, "%s\n", is_vses ? "Found VSES" : "Found real SES"); + for_each_elem_status(elem_status, &ses_data, &ses_cfg) { + index = index_in_page2(&ses_data, elem_status->slot_id); + if (index != -1) + get_drive_phy_loc_with_ses_phy_loc(ses, &drive_data, index, phy_loc, 0); - for_each_elem_status(elem_status, &ses_data, &ses_cfg) { - index = index_in_page2(&ses_data, elem_status->slot_id); - if (index != -1) - get_drive_phy_loc_with_ses_phy_loc(ses, &drive_data, index, phy_loc, 0); - - if (elem_status->status == IPR_DRIVE_ELEM_STATUS_UNSUPP) - continue; - if (elem_status->status == IPR_DRIVE_ELEM_STATUS_NO_ACCESS) - continue; - if (is_spi && (scsi_id_found & (1 << elem_status->slot_id))) - continue; - scsi_id_found |= (1 << elem_status->slot_id); - - if (ioa->sis64) - dev = get_dev_for_slot_64bit(ses, elem_status->slot_id, phy_loc); - else - dev = get_dev_for_slot(ses, elem_status->slot_id, is_vses, phy_loc); - if (!dev) - continue; + if (elem_status->status == IPR_DRIVE_ELEM_STATUS_UNSUPP) + continue; + if (elem_status->status == IPR_DRIVE_ELEM_STATUS_NO_ACCESS) + continue; + if (is_spi && (scsi_id_found & (1 << elem_status->slot_id))) + continue; + scsi_id_found |= (1 << elem_status->slot_id); - } + if (ioa->sis64) + dev = get_dev_for_slot_64bit(ses, elem_status->slot_id, phy_loc); + else + dev = get_dev_for_slot(ses, elem_status->slot_id, is_vses, phy_loc); + if (!dev) + continue; } + } return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils-2.4.16.1/iprinit.c new/iprutils-2.4.17.1/iprinit.c --- old/iprutils-2.4.16.1/iprinit.c 2018-04-25 23:15:05.000000000 +0200 +++ new/iprutils-2.4.17.1/iprinit.c 2018-06-05 17:41:15.000000000 +0200 @@ -33,9 +33,7 @@ int rc = tool_init(1); if (rc && rc != -ENXIO) { - if (daemonize) - syslog(LOG_ERR, "Run iprinit manually to ensure all ipr RAID adapters are running optimally.\n"); - else + if (!daemonize) syslog(LOG_ERR, "Error initializing adapters. Perhaps run with sudo?\n"); } check_current_config(false); @@ -94,8 +92,6 @@ rc = init_all(); if (rc) { - syslog(LOG_INFO, "Waiting for ipr adapters and sg module to come ready.\n"); - delay_secs = 2; sleep(delay_secs); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils-2.4.16.1/spec/Makefile.in new/iprutils-2.4.17.1/spec/Makefile.in --- old/iprutils-2.4.16.1/spec/Makefile.in 2018-05-08 17:22:15.000000000 +0200 +++ new/iprutils-2.4.17.1/spec/Makefile.in 2018-10-30 15:18:34.000000000 +0100 @@ -248,6 +248,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +udevrulesdir = @udevrulesdir@ EXTRA_DIST = iprutils.spec all: all-am diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils-2.4.16.1/spec/iprutils.spec new/iprutils-2.4.17.1/spec/iprutils.spec --- old/iprutils-2.4.16.1/spec/iprutils.spec 2018-05-01 22:22:00.000000000 +0200 +++ new/iprutils-2.4.17.1/spec/iprutils.spec 2018-10-30 15:16:14.000000000 +0100 @@ -1,6 +1,6 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils -Version: 2.4.16 +Version: 2.4.17 # For RC releases, release_prefix should be set to 0.rc1, 0.rc2, etc. # For GA releases, release_prefix should be set to 1, 2, 3, etc. %define release_prefix 1 @@ -137,15 +137,6 @@ %endif #SUSE %if 0%{?rhel} - -%if 0%{?rhel} >= 7 -# FIXME: We should be able to use systemd_post macro here, but ipr is -# not in the preset list for RHEL. -/usr/bin/systemctl enable iprinit.service 2>&1 1>/dev/null -/usr/bin/systemctl enable iprupdate.service 2>&1 1>/dev/null -/usr/bin/systemctl enable iprdump.service 2>&1 1>/dev/null -%endif - %if 0%{!?_unitdir:1} && 0%{?rhel} /sbin/chkconfig --add iprinit /sbin/chkconfig --add iprupdate @@ -153,19 +144,11 @@ %endif %endif #RHEL -%if "%{?dist}" == "pkvm3_1" -# FIXME: We should be able to use systemd_post macro here, but ipr is -# not in the preset list for pkvm. -/usr/bin/systemctl enable iprinit.service 2>&1 1>/dev/null -/usr/bin/systemctl enable iprupdate.service 2>&1 1>/dev/null -/usr/bin/systemctl enable iprdump.service 2>&1 1>/dev/null -%endif - # Start daemons. %if 0%{?_unitdir:1}%{!?_unitdir:0} -/usr/bin/systemctl start iprinit.service || : -/usr/bin/systemctl start iprupdate.service || : -/usr/bin/systemctl start iprdump.service || : +if [ -d /sys/module/ipr ] ; then +/usr/bin/systemctl start iprutils.target || : +fi %else service iprinit start || : service iprupdate start || : @@ -307,6 +290,8 @@ %{_unitdir}/iprinit.service %{_unitdir}/iprupdate.service %{_unitdir}/iprdump.service +%{_unitdir}/iprutils.target +%{_usr}/lib/udev/rules.d/90-iprutils.rules %else %{_initrddir}/iprinit %{_initrddir}/iprupdate @@ -322,6 +307,10 @@ %endif #WITH_STATIC %changelog +* Fri Oct 26 2018 Brian King <[email protected]> 2.4.17 +- Additional speedup for show-details +- Utilize udev rules for systemd daemon activation +- Miscellaneous build fixes * Tue May 1 2018 Brian King <[email protected]> 2.4.16 - Speedup for show-details - Improve error messages when creating the arrays with RI and non-RI disks diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils-2.4.16.1/systemd/Makefile.am new/iprutils-2.4.17.1/systemd/Makefile.am --- old/iprutils-2.4.16.1/systemd/Makefile.am 2018-04-25 23:15:05.000000000 +0200 +++ new/iprutils-2.4.17.1/systemd/Makefile.am 2018-06-05 17:41:15.000000000 +0200 @@ -17,6 +17,7 @@ iprinit.service iprupdate.service EXTRA_DIST = iprdump.service.in \ iprinit.service.in iprupdate.service.in +dist_systemdunit_DATA = iprutils.target clean-local: -rm iprdump.service iprinit.service iprupdate.service diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils-2.4.16.1/systemd/Makefile.in new/iprutils-2.4.17.1/systemd/Makefile.in --- old/iprutils-2.4.16.1/systemd/Makefile.in 2018-05-08 17:22:15.000000000 +0200 +++ new/iprutils-2.4.17.1/systemd/Makefile.in 2018-10-30 15:18:34.000000000 +0100 @@ -89,7 +89,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = systemd -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(dist_systemdunit_DATA) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/build-aux/libtool.m4 \ $(top_srcdir)/build-aux/ltoptions.m4 \ @@ -148,8 +149,9 @@ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(systemdunitdir)" -DATA = $(nodist_systemdunit_DATA) +am__installdirs = "$(DESTDIR)$(systemdunitdir)" \ + "$(DESTDIR)$(systemdunitdir)" +DATA = $(dist_systemdunit_DATA) $(nodist_systemdunit_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -278,12 +280,14 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +udevrulesdir = @udevrulesdir@ nodist_systemdunit_DATA = iprdump.service \ iprinit.service iprupdate.service EXTRA_DIST = iprdump.service.in \ iprinit.service.in iprupdate.service.in +dist_systemdunit_DATA = iprutils.target all: all-am .SUFFIXES: @@ -323,6 +327,27 @@ clean-libtool: -rm -rf .libs _libs +install-dist_systemdunitDATA: $(dist_systemdunit_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_systemdunit_DATA)'; test -n "$(systemdunitdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(systemdunitdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(systemdunitdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(systemdunitdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(systemdunitdir)" || exit $$?; \ + done + +uninstall-dist_systemdunitDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_systemdunit_DATA)'; test -n "$(systemdunitdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(systemdunitdir)'; $(am__uninstall_files_from_dir) install-nodist_systemdunitDATA: $(nodist_systemdunit_DATA) @$(NORMAL_INSTALL) @list='$(nodist_systemdunit_DATA)'; test -n "$(systemdunitdir)" || list=; \ @@ -385,7 +410,7 @@ check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(systemdunitdir)"; do \ + for dir in "$(DESTDIR)$(systemdunitdir)" "$(DESTDIR)$(systemdunitdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -438,7 +463,8 @@ info-am: -install-data-am: install-nodist_systemdunitDATA +install-data-am: install-dist_systemdunitDATA \ + install-nodist_systemdunitDATA install-dvi: install-dvi-am @@ -482,22 +508,25 @@ ps-am: -uninstall-am: uninstall-nodist_systemdunitDATA +uninstall-am: uninstall-dist_systemdunitDATA \ + uninstall-nodist_systemdunitDATA .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ clean-local cscopelist-am ctags-am distclean distclean-generic \ distclean-libtool distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ + install install-am install-data install-data-am \ + install-dist_systemdunitDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man \ install-nodist_systemdunitDATA install-pdf install-pdf-am \ install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ - uninstall-am uninstall-nodist_systemdunitDATA + uninstall-am uninstall-dist_systemdunitDATA \ + uninstall-nodist_systemdunitDATA %.service: %.service.in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils-2.4.16.1/systemd/iprdump.service.in new/iprutils-2.4.17.1/systemd/iprdump.service.in --- old/iprutils-2.4.16.1/systemd/iprdump.service.in 2018-04-25 23:15:05.000000000 +0200 +++ new/iprutils-2.4.17.1/systemd/iprdump.service.in 2018-06-05 17:41:15.000000000 +0200 @@ -7,4 +7,4 @@ ExecStart=@sbindir@/iprdump --daemon [Install] -WantedBy=multi-user.target +WantedBy=iprutils.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils-2.4.16.1/systemd/iprinit.service.in new/iprutils-2.4.17.1/systemd/iprinit.service.in --- old/iprutils-2.4.16.1/systemd/iprinit.service.in 2018-04-25 23:15:05.000000000 +0200 +++ new/iprutils-2.4.17.1/systemd/iprinit.service.in 2018-06-05 17:41:15.000000000 +0200 @@ -6,4 +6,4 @@ ExecStart=@sbindir@/iprinit --daemon [Install] -WantedBy=multi-user.target +WantedBy=iprutils.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils-2.4.16.1/systemd/iprupdate.service.in new/iprutils-2.4.17.1/systemd/iprupdate.service.in --- old/iprutils-2.4.16.1/systemd/iprupdate.service.in 2018-04-25 23:15:05.000000000 +0200 +++ new/iprutils-2.4.17.1/systemd/iprupdate.service.in 2018-06-05 17:41:15.000000000 +0200 @@ -6,4 +6,4 @@ ExecStart=@sbindir@/iprupdate --daemon [Install] -WantedBy=multi-user.target +WantedBy=iprutils.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils-2.4.16.1/systemd/iprutils.target new/iprutils-2.4.17.1/systemd/iprutils.target --- old/iprutils-2.4.16.1/systemd/iprutils.target 1970-01-01 01:00:00.000000000 +0100 +++ new/iprutils-2.4.17.1/systemd/iprutils.target 2018-06-05 17:41:15.000000000 +0200 @@ -0,0 +1,7 @@ +[Unit] +Description=IBM Power Raid utilities +Requires=iprupdate.service iprinit.service iprdump.service basic.target +Before=default.target + +[Install] +WantedBy=default.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils-2.4.16.1/udev/90-iprutils.rules new/iprutils-2.4.17.1/udev/90-iprutils.rules --- old/iprutils-2.4.16.1/udev/90-iprutils.rules 1970-01-01 01:00:00.000000000 +0100 +++ new/iprutils-2.4.17.1/udev/90-iprutils.rules 2018-06-05 17:41:15.000000000 +0200 @@ -0,0 +1 @@ +DRIVERS=="ipr", TAG+="systemd", ENV{SYSTEMD_WANTS}+="iprutils.target" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils-2.4.16.1/udev/Makefile.am new/iprutils-2.4.17.1/udev/Makefile.am --- old/iprutils-2.4.16.1/udev/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/iprutils-2.4.17.1/udev/Makefile.am 2018-06-05 17:41:15.000000000 +0200 @@ -0,0 +1,12 @@ +# IBM IPR adapter configuration utility +# +# (C) Copyright 2015 +# International Business Machines Corporation and others. +# All Rights Reserved. This program and the accompanying +# materials are made available under the terms of the +# Common Public License v1.0 which accompanies this distribution. +# +# + +udevrulesdir = @udevrulesdir@ +dist_udevrules_DATA = 90-iprutils.rules diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iprutils-2.4.16.1/udev/Makefile.in new/iprutils-2.4.17.1/udev/Makefile.in --- old/iprutils-2.4.16.1/udev/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ new/iprutils-2.4.17.1/udev/Makefile.in 2018-10-30 15:18:34.000000000 +0100 @@ -0,0 +1,502 @@ +# Makefile.in generated by automake 1.13.4 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# IBM IPR adapter configuration utility +# +# (C) Copyright 2015 +# International Business Machines Corporation and others. +# All Rights Reserved. This program and the accompanying +# materials are made available under the terms of the +# Common Public License v1.0 which accompanies this distribution. +# +# + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = udev +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(dist_udevrules_DATA) +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/build-aux/libtool.m4 \ + $(top_srcdir)/build-aux/ltoptions.m4 \ + $(top_srcdir)/build-aux/ltsugar.m4 \ + $(top_srcdir)/build-aux/ltversion.m4 \ + $(top_srcdir)/build-aux/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(udevrulesdir)" +DATA = $(dist_udevrules_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +IPRCONFIG_LIBS = @IPRCONFIG_LIBS@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PYTHON = @PYTHON@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +initddir = @initddir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +systemdunitdir = @systemdunitdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +udevrulesdir = @udevrulesdir@ +dist_udevrules_DATA = 90-iprutils.rules +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign udev/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign udev/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-dist_udevrulesDATA: $(dist_udevrules_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_udevrules_DATA)'; test -n "$(udevrulesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(udevrulesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(udevrulesdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(udevrulesdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(udevrulesdir)" || exit $$?; \ + done + +uninstall-dist_udevrulesDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_udevrules_DATA)'; test -n "$(udevrulesdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(udevrulesdir)'; $(am__uninstall_files_from_dir) +tags TAGS: + +ctags CTAGS: + +cscope cscopelist: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(udevrulesdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-dist_udevrulesDATA + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-dist_udevrulesDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-dist_udevrulesDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-dist_udevrulesDATA + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: ++++++ iprutils.fix_ncurses_cflags_var.patch ++++++ --- /var/tmp/diff_new_pack.f7Czz5/_old 2018-11-14 14:29:01.679579611 +0100 +++ /var/tmp/diff_new_pack.f7Czz5/_new 2018-11-14 14:29:01.683579607 +0100 @@ -1,15 +1,12 @@ -Index: iprutils/iprutils-rel-2-4-11/configure.ac -=================================================================== ---- iprutils.orig/iprutils-rel-2-4-11/configure.ac -+++ iprutils/iprutils-rel-2-4-11/configure.ac -@@ -20,8 +20,8 @@ AC_PROG_CC - AC_PROG_INSTALL - LT_INIT - --ncurses_include=$(ncurses5-config --cflags) --if test -n ${ncurses_include}; then -+ncurses_include="$(ncurses5-config --cflags)" -+if test -n "${ncurses_include}"; then - CFLAGS="${CFLAGS} ${ncurses_include}" +diff -ur iprutils-2.4.17.1/configure.ac iprutils-2.4.17.1.mod/configure.ac +--- iprutils-2.4.17.1/configure.ac 2018-10-30 15:16:14.000000000 +0100 ++++ iprutils-2.4.17.1.mod/configure.ac 2018-10-31 16:07:31.459599362 +0100 +@@ -140,7 +140,7 @@ fi + if test -n ${ncurses_config}; then +- ncurses_include=$(${ncurses_config} --cflags) ++ ncurses_include="$(${ncurses_config} --cflags)" + + if test -n "${ncurses_include}"; then + CFLAGS="${CFLAGS} ${ncurses_include}"
