Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package scsirastools for openSUSE:Factory
checked in at 2023-01-29 14:11:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/scsirastools (Old)
and /work/SRC/openSUSE:Factory/.scsirastools.new.32243 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scsirastools"
Sun Jan 29 14:11:09 2023 rev:23 rq:1061810 version:1.6.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/scsirastools/scsirastools.changes
2022-12-02 13:13:34.693997367 +0100
+++ /work/SRC/openSUSE:Factory/.scsirastools.new.32243/scsirastools.changes
2023-01-29 14:18:34.989549877 +0100
@@ -1,0 +2,7 @@
+Mon Jan 2 13:36:45 UTC 2023 - Dirk Müller <dmuel...@suse.com>
+
+- update to 1.6.6:
+ src/sgcommon.c,sgsubmon.c - include <sys/sysmacros.h>
+- scsirastools-add-systemd-support.patch: refresh
+
+-------------------------------------------------------------------
Old:
----
scsirastools-1.6.4.tar.gz
New:
----
scsirastools-1.6.6.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ scsirastools.spec ++++++
--- /var/tmp/diff_new_pack.dDoFmm/_old 2023-01-29 14:18:35.493552590 +0100
+++ /var/tmp/diff_new_pack.dDoFmm/_new 2023-01-29 14:18:35.497552612 +0100
@@ -1,7 +1,7 @@
#
# spec file for package scsirastools
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: scsirastools
-Version: 1.6.4
+Version: 1.6.6
Release: 0
Summary: Serviceability for SCSI Disks and Arrays
License: BSD-3-Clause
++++++ scsirastools-1.6.4.tar.gz -> scsirastools-1.6.6.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scsirastools-1.6.4/ChangeLog
new/scsirastools-1.6.6/ChangeLog
--- old/scsirastools-1.6.4/ChangeLog 2011-08-23 15:26:05.000000000 +0200
+++ new/scsirastools-1.6.6/ChangeLog 2016-05-22 04:11:26.000000000 +0200
@@ -501,3 +501,22 @@
sgmode.c ver 1.64
sgraidmon.c ver 1.64
sgsafte.c ver 1.64
+
+1.6.5 = ARCress updated 12/08/11, released 12/12/11
+ src/sgmode.c - handle *.mdf lines > 80 chars (up to 160 chars)
+ src/sgsub.c - handle mode_select len > 50 (up to 64 bytes)
+ src/Makefile.am - remove sgerr in make clean
+
+1.6.6 = ARCress updated 04/22/16
+ configure.ac - added (renamed from configure.in)
+ configure.in - removed
+ beforeconf.sh - new, script before configure
+ src/sgcommon.c,sgsubmon.c - include <sys/sysmacros.h>
+ scsirastools-1.6.6 contains:
+ sgdefects.c ver 1.66
+ sgdiag.c ver 1.66
+ sgdiskmon.c ver 1.66
+ sgdskfl.c ver 1.66
+ sgmode.c ver 1.66
+ sgraidmon.c ver 1.66
+ sgsafte.c ver 1.66
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scsirastools-1.6.4/Makefile.in
new/scsirastools-1.6.6/Makefile.in
--- old/scsirastools-1.6.4/Makefile.in 2011-08-23 15:26:05.000000000 +0200
+++ new/scsirastools-1.6.6/Makefile.in 2016-05-23 15:50:10.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004 Free Software Foundation, Inc.
+# 2003, 2004, 2005 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.
@@ -39,7 +39,7 @@
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
TODO depcomp install-sh missing mkinstalldirs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -211,7 +211,13 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @set fnord $$MAKEFLAGS; amf=$$2; \
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -223,7 +229,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ || eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -231,7 +237,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
- @set fnord $$MAKEFLAGS; amf=$$2; \
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -252,7 +264,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ || eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scsirastools-1.6.4/aclocal.m4
new/scsirastools-1.6.6/aclocal.m4
--- old/scsirastools-1.6.4/aclocal.m4 2011-08-23 15:26:05.000000000 +0200
+++ new/scsirastools-1.6.6/aclocal.m4 2016-05-23 15:50:09.000000000 +0200
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005 Free Software Foundation, Inc.
# This file 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.
@@ -11,23 +11,11 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-# -*- Autoconf -*-
-# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-# Generated from amversion.in; do not edit by hand.
-
-# 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+#
+# This file 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.
# AM_AUTOMAKE_VERSION(VERSION)
# ----------------------------
@@ -40,26 +28,15 @@
# Call AM_AUTOMAKE_VERSION so it can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.9.2])])
-
-# AM_AUX_DIR_EXPAND
+ [AM_AUTOMAKE_VERSION([1.9.6])])
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+#
+# This file 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.
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
@@ -106,26 +83,16 @@
am_aux_dir=`cd $ac_aux_dir && pwd`
])
-# AM_CONDITIONAL -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
+# AM_CONDITIONAL -*- Autoconf -*-
-# 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file 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.
-# serial 6
+# serial 7
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
@@ -149,26 +116,15 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# serial 7 -*- Autoconf -*-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc.
+#
+# This file 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 free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
+# serial 8
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
@@ -177,7 +133,6 @@
# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
# _AM_DEPENDENCIES(NAME)
# ----------------------
# See how the compiler implements dependency checking.
@@ -317,27 +272,16 @@
AC_SUBST([AMDEPBACKSLASH])
])
-# Generate code to set up dependency tracking. -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, Inc.
-
-# 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+# Generate code to set up dependency tracking. -*- Autoconf -*-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file 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.
-#serial 2
+#serial 3
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
@@ -396,54 +340,31 @@
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
])
-# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
-
-# 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file 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.
-# serial 7
+# serial 8
# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-# Do all the work for Automake. -*- Autoconf -*-
-
-# This macro actually does too much some checks are only needed if
-# your package does certain things. But this isn't really a big deal.
+# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc.
+#
+# This file 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 free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# serial 12
-# serial 11
+# This macro actually does too much. Some checks are only needed if
+# your package does certain things. But this isn't really a big deal.
# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
# AM_INIT_AUTOMAKE([OPTIONS])
@@ -545,51 +466,27 @@
done
echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+#
+# This file 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.
+
# AM_PROG_INSTALL_SH
# ------------------
# Define $install_sh.
-
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-
-# 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
install_sh=${install_sh-"$am_aux_dir/install-sh"}
AC_SUBST(install_sh)])
-# -*- Autoconf -*-
-# Copyright (C) 2003 Free Software Foundation, Inc.
-
-# 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+#
+# This file 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.
-# serial 1
+# serial 2
# Check whether the underlying file-system supports filenames
# with a leading dot. For instance MS-DOS doesn't.
@@ -604,26 +501,15 @@
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
-# Check to see how 'make' treats includes. -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
-
-# 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+# Check to see how 'make' treats includes. -*- Autoconf -*-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+#
+# This file 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.
-# serial 2
+# serial 3
# AM_MAKE_INCLUDE()
# -----------------
@@ -667,27 +553,16 @@
rm -f confinc confmf
])
-# -*- Autoconf -*-
-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file 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.
-# serial 3
+# serial 4
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
@@ -713,27 +588,16 @@
fi
])
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+#
+# This file 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.
+
# AM_PROG_MKDIR_P
# ---------------
# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-
-# 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
+#
# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
# created by `make install' are always world readable, even if the
# installer happens to have an overly restrictive umask (e.g. 077).
@@ -787,26 +651,15 @@
fi
AC_SUBST([mkdir_p])])
-# Helper functions for option handling. -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+# Helper functions for option handling. -*- Autoconf -*-
-# 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+#
+# This file 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.
-# serial 2
+# serial 3
# _AM_MANGLE_OPTION(NAME)
# -----------------------
@@ -831,28 +684,16 @@
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-#
-# Check to make sure that the build environment is sane.
-#
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
+# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file 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.
-# serial 3
+# serial 4
# AM_SANITY_CHECK
# ---------------
@@ -895,25 +736,14 @@
fi
AC_MSG_RESULT(yes)])
-# AM_PROG_INSTALL_STRIP
-
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-
-# 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+#
+# This file 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.
+# AM_PROG_INSTALL_STRIP
+# ---------------------
# One issue with vendor `install' (even GNU) is that you can't
# specify the program used to strip binaries. This is especially
# annoying in cross-compiling environments, where the build's strip
@@ -936,25 +766,13 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004 Free Software Foundation, Inc.
-
-# 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 1
+# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+#
+# This file 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.
+# serial 2
# _AM_PROG_TAR(FORMAT)
# --------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scsirastools-1.6.4/beforeconf.sh
new/scsirastools-1.6.6/beforeconf.sh
--- old/scsirastools-1.6.4/beforeconf.sh 1970-01-01 01:00:00.000000000
+0100
+++ new/scsirastools-1.6.6/beforeconf.sh 2016-05-22 04:06:52.000000000
+0200
@@ -0,0 +1,3 @@
+autoconf
+aclocal
+automake
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scsirastools-1.6.4/config.h.in
new/scsirastools-1.6.6/config.h.in
--- old/scsirastools-1.6.4/config.h.in 2011-08-23 15:26:05.000000000 +0200
+++ new/scsirastools-1.6.6/config.h.in 2016-05-22 04:16:19.000000000 +0200
@@ -1,4 +1,4 @@
-/* config.h.in. Generated from configure.in by autoheader. */
+/* config.h.in. Generated from configure.ac by autoheader. */
/* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scsirastools-1.6.4/configure
new/scsirastools-1.6.6/configure
--- old/scsirastools-1.6.4/configure 2011-08-23 15:26:05.000000000 +0200
+++ new/scsirastools-1.6.6/configure 2016-05-23 15:50:09.000000000 +0200
@@ -1604,7 +1604,7 @@
# Define the identity of the package.
PACKAGE=scsirastools
- VERSION=1.6.4
+ VERSION=1.6.6
cat >>confdefs.h <<_ACEOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scsirastools-1.6.4/configure.ac
new/scsirastools-1.6.6/configure.ac
--- old/scsirastools-1.6.4/configure.ac 1970-01-01 01:00:00.000000000 +0100
+++ new/scsirastools-1.6.6/configure.ac 2016-05-23 15:31:57.000000000 +0200
@@ -0,0 +1,31 @@
+dnl Process this file with autoconf to produce a configure script.
+AC_INIT(src/getmd.c)
+exec_prefix=
+AM_INIT_AUTOMAKE(scsirastools,1.6.6)
+AM_CONFIG_HEADER(config.h)
+
+AC_PREFIX_DEFAULT(/usr)
+
+dnl Checks for programs.
+AC_PROG_CC
+AC_PROG_MAKE_SET
+
+dnl Checks for libraries.
+
+dnl Checks for header files.
+AC_HEADER_STDC
+AC_CHECK_HEADERS(fcntl.h sys/ioctl.h unistd.h)
+
+dnl Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+
+dnl Checks for library functions.
+AC_PROG_GCC_TRADITIONAL
+AC_FUNC_MEMCMP
+AC_CHECK_FUNCS(strcspn strspn uname)
+
+[ if test -n "$GCC"; then
+ CFLAGS="$CFLAGS -Wall"
+ fi]
+
+AC_OUTPUT(Makefile src/Makefile doc/Makefile files/Makefile mdadm.d/Makefile)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scsirastools-1.6.4/configure.in
new/scsirastools-1.6.6/configure.in
--- old/scsirastools-1.6.4/configure.in 2011-08-23 15:26:05.000000000 +0200
+++ new/scsirastools-1.6.6/configure.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,31 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT(src/getmd.c)
-exec_prefix=
-AM_INIT_AUTOMAKE(scsirastools,1.6.4)
-AM_CONFIG_HEADER(config.h)
-
-AC_PREFIX_DEFAULT(/usr)
-
-dnl Checks for programs.
-AC_PROG_CC
-AC_PROG_MAKE_SET
-
-dnl Checks for libraries.
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(fcntl.h sys/ioctl.h unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-
-dnl Checks for library functions.
-AC_PROG_GCC_TRADITIONAL
-AC_FUNC_MEMCMP
-AC_CHECK_FUNCS(strcspn strspn uname)
-
-[ if test -n "$GCC"; then
- CFLAGS="$CFLAGS -Wall"
- fi]
-
-AC_OUTPUT(Makefile src/Makefile doc/Makefile files/Makefile mdadm.d/Makefile)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scsirastools-1.6.4/cprpm new/scsirastools-1.6.6/cprpm
--- old/scsirastools-1.6.4/cprpm 2011-08-23 15:26:05.000000000 +0200
+++ new/scsirastools-1.6.6/cprpm 2016-05-22 04:13:43.000000000 +0200
@@ -1,5 +1,5 @@
#!/bin/sh
-ver=1.6.4-1
+ver=1.6.6
verk=`echo $ver |cut -f1 -d'-'`
march=`rpmbuild --showrc |grep " _target_cpu" | head -n1| awk '{print $3}'`
pkgd3=`rpmbuild --showrc |grep " _topdir" |tail -n1 |awk '{print $3}' |cut -f2
-d'/'`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scsirastools-1.6.4/doc/Makefile
new/scsirastools-1.6.6/doc/Makefile
--- old/scsirastools-1.6.4/doc/Makefile 2011-08-23 15:26:08.000000000 +0200
+++ new/scsirastools-1.6.6/doc/Makefile 2016-05-23 15:50:18.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# doc/Makefile. Generated from Makefile.in by configure.
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004 Free Software Foundation, Inc.
+# 2003, 2004, 2005 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.
@@ -38,7 +38,7 @@
subdir = doc
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -91,7 +91,7 @@
SET_MAKE =
SHELL = /bin/sh
STRIP =
-VERSION = 1.6.4
+VERSION = 1.6.6
ac_ct_CC = gcc
ac_ct_STRIP =
am__fastdepCC_FALSE = #
@@ -108,7 +108,7 @@
host_alias =
includedir = ${prefix}/include
infodir = ${prefix}/info
-install_sh = /usr/dev/scsirastools-1.6.4/install-sh
+install_sh = /home/acress/scsirastools/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localstatedir = ${prefix}/var
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scsirastools-1.6.4/doc/Makefile.in
new/scsirastools-1.6.6/doc/Makefile.in
--- old/scsirastools-1.6.4/doc/Makefile.in 2011-08-23 15:26:05.000000000
+0200
+++ new/scsirastools-1.6.6/doc/Makefile.in 2016-05-23 15:50:10.000000000
+0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004 Free Software Foundation, Inc.
+# 2003, 2004, 2005 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.
@@ -38,7 +38,7 @@
subdir = doc
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scsirastools-1.6.4/doc/scsirastools.spec
new/scsirastools-1.6.6/doc/scsirastools.spec
--- old/scsirastools-1.6.4/doc/scsirastools.spec 2011-08-23
15:26:05.000000000 +0200
+++ new/scsirastools-1.6.6/doc/scsirastools.spec 2016-05-22
04:08:56.000000000 +0200
@@ -1,5 +1,5 @@
Name: scsirastools
-%define Version 1.6.4
+%define Version 1.6.6
Version: %Version
Release: 1
Summary: A package that adds several SCSI Serviceability Tools
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scsirastools-1.6.4/files/Makefile
new/scsirastools-1.6.6/files/Makefile
--- old/scsirastools-1.6.4/files/Makefile 2011-08-23 15:26:08.000000000
+0200
+++ new/scsirastools-1.6.6/files/Makefile 2016-05-23 15:50:18.000000000
+0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# files/Makefile. Generated from Makefile.in by configure.
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004 Free Software Foundation, Inc.
+# 2003, 2004, 2005 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.
@@ -38,7 +38,7 @@
subdir = files
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -91,7 +91,7 @@
SET_MAKE =
SHELL = /bin/sh
STRIP =
-VERSION = 1.6.4
+VERSION = 1.6.6
ac_ct_CC = gcc
ac_ct_STRIP =
am__fastdepCC_FALSE = #
@@ -108,7 +108,7 @@
host_alias =
includedir = ${prefix}/include
infodir = ${prefix}/info
-install_sh = /usr/dev/scsirastools-1.6.4/install-sh
+install_sh = /home/acress/scsirastools/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localstatedir = ${prefix}/var
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scsirastools-1.6.4/files/Makefile.in
new/scsirastools-1.6.6/files/Makefile.in
--- old/scsirastools-1.6.4/files/Makefile.in 2011-08-23 15:26:05.000000000
+0200
+++ new/scsirastools-1.6.6/files/Makefile.in 2016-05-23 15:50:10.000000000
+0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004 Free Software Foundation, Inc.
+# 2003, 2004, 2005 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.
@@ -38,7 +38,7 @@
subdir = files
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scsirastools-1.6.4/mdadm.d/Makefile
new/scsirastools-1.6.6/mdadm.d/Makefile
--- old/scsirastools-1.6.4/mdadm.d/Makefile 2011-08-23 15:26:08.000000000
+0200
+++ new/scsirastools-1.6.6/mdadm.d/Makefile 2016-05-23 15:50:18.000000000
+0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# mdadm.d/Makefile. Generated from Makefile.in by configure.
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004 Free Software Foundation, Inc.
+# 2003, 2004, 2005 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.
@@ -46,7 +46,7 @@
subdir = mdadm.d
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -96,7 +96,7 @@
SET_MAKE =
SHELL = /bin/sh
STRIP =
-VERSION = 1.6.4
+VERSION = 1.6.6
ac_ct_CC = gcc
ac_ct_STRIP =
am__fastdepCC_FALSE = #
@@ -113,7 +113,7 @@
host_alias =
includedir = ${prefix}/include
infodir = ${prefix}/info
-install_sh = /usr/dev/scsirastools-1.6.4/install-sh
+install_sh = /home/acress/scsirastools/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localstatedir = ${prefix}/var
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scsirastools-1.6.4/mdadm.d/Makefile.in
new/scsirastools-1.6.6/mdadm.d/Makefile.in
--- old/scsirastools-1.6.4/mdadm.d/Makefile.in 2011-08-23 15:26:05.000000000
+0200
+++ new/scsirastools-1.6.6/mdadm.d/Makefile.in 2016-05-23 15:50:10.000000000
+0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004 Free Software Foundation, Inc.
+# 2003, 2004, 2005 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.
@@ -46,7 +46,7 @@
subdir = mdadm.d
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scsirastools-1.6.4/setver
new/scsirastools-1.6.6/setver
--- old/scsirastools-1.6.4/setver 2011-08-23 15:26:05.000000000 +0200
+++ new/scsirastools-1.6.6/setver 2016-05-23 15:32:22.000000000 +0200
@@ -3,7 +3,7 @@
# WARNING: run aclocal,autoconf, and automake after this for sanity
# The autoconf must match the aclocal.m4 version (mine is 1.4).
#
-ver=1.6.4
+ver=1.6.6
tmped=/tmp/edver.tmp
setver=1
v12=`echo $ver |cut -f1,2 -d'.'`
@@ -27,6 +27,7 @@
q
%%%
ed configure.in <$tmped
+ed configure.ac <$tmped
cat - <<%%% >$tmped
1
@@ -61,6 +62,20 @@
%%%
ed cprpm <$tmped
+cat - <<%%% >$tmped
+1
+/^ver
+c
+ver=${ver}
+.
+w
+q
+%%%
+if [ -f ../buildscsi.sh ]
+then
+ ed ../buildscsi.sh <$tmped
+fi
+
# bump each of the utility progver values by one.
relnote=/tmp/scsiras.rel
utilc="sgdefects.c sgdiag.c sgdiskmon.c sgdskfl.c sgmode.c sgraidmon.c
sgsafte.c"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scsirastools-1.6.4/src/Makefile.am
new/scsirastools-1.6.6/src/Makefile.am
--- old/scsirastools-1.6.4/src/Makefile.am 2011-08-23 15:26:05.000000000
+0200
+++ new/scsirastools-1.6.6/src/Makefile.am 2016-05-22 04:06:04.000000000
+0200
@@ -4,6 +4,7 @@
-DDATA_DIR=\"$(pkgdatadir)\"
sbin_PROGRAMS = getmd sgdefects sgdiag sgdskfl sgmode sgraidmon sgsafte
sgdiskmon
+other_TARGS = sgerr
sgerr: sgerr.c
gcc $(CFLAGS) -DTEST -o sgerr sgerr.c
@@ -25,3 +26,6 @@
sgsafte_SOURCES = sgsafte.c sgsubmon.c
EXTRA_DIST = scsierr.h sgcommon.h sgsub.h sgsubmon.h
+
+clean-generic:
+ rm -f $(other_TARGS) *.tmp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scsirastools-1.6.4/src/Makefile.in
new/scsirastools-1.6.6/src/Makefile.in
--- old/scsirastools-1.6.4/src/Makefile.in 2011-08-23 15:26:05.000000000
+0200
+++ new/scsirastools-1.6.6/src/Makefile.in 2016-05-23 15:50:10.000000000
+0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004 Free Software Foundation, Inc.
+# 2003, 2004, 2005 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.
@@ -14,8 +14,6 @@
@SET_MAKE@
-SOURCES = $(getmd_SOURCES) $(sgdefects_SOURCES) $(sgdiag_SOURCES)
$(sgdiskmon_SOURCES) $(sgdskfl_SOURCES) $(sgmode_SOURCES) $(sgraidmon_SOURCES)
$(sgsafte_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -42,7 +40,7 @@
subdir = src
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -170,6 +168,7 @@
INCLUDES = -I ../intl -DLOCALEDIR=\"$(localedir)\" \
-DDATA_DIR=\"$(pkgdatadir)\"
+other_TARGS = sgerr
getmd_SOURCES = getmd.c
sgdefects_SOURCES = sgdefects.c sgsub.c sgerr.c sgcommon.c
sgdiag_SOURCES = sgdiag.c sgsub.c sgerr.c sgcommon.c
@@ -392,8 +391,6 @@
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
-clean-generic:
-
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -463,6 +460,9 @@
sgerr: sgerr.c
gcc $(CFLAGS) -DTEST -o sgerr sgerr.c
+
+clean-generic:
+ rm -f $(other_TARGS) *.tmp
# 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:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scsirastools-1.6.4/src/sgcommon.c
new/scsirastools-1.6.6/src/sgcommon.c
--- old/scsirastools-1.6.4/src/sgcommon.c 2011-08-23 15:26:05.000000000
+0200
+++ new/scsirastools-1.6.6/src/sgcommon.c 2016-05-22 04:07:35.000000000
+0200
@@ -64,6 +64,7 @@
-------------------------------------------------------------------------*/
#include <sys/types.h>
#include <sys/stat.h>
+#include <sys/sysmacros.h>
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scsirastools-1.6.4/src/sgdefects.c
new/scsirastools-1.6.6/src/sgdefects.c
--- old/scsirastools-1.6.4/src/sgdefects.c 2011-08-23 15:26:05.000000000
+0200
+++ new/scsirastools-1.6.6/src/sgdefects.c 2016-05-22 04:08:56.000000000
+0200
@@ -83,7 +83,7 @@
#define MAX_ERRORS 4
/* Global data definitions */
-char *progver = "1.64"; /* program version */
+char *progver = "1.66"; /* program version */
char *progname = "sgdefects"; /* program name */
char logfile[] = "/var/log/sgdefects.log"; /* log filename */
char model[20] = ""; /* default model string */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scsirastools-1.6.4/src/sgdiag.c
new/scsirastools-1.6.6/src/sgdiag.c
--- old/scsirastools-1.6.4/src/sgdiag.c 2011-08-23 15:26:05.000000000 +0200
+++ new/scsirastools-1.6.6/src/sgdiag.c 2016-05-22 04:08:56.000000000 +0200
@@ -101,7 +101,7 @@
extern char HeaderStr[1]; /* from sgcommon.c */
/* Global data definitions */
-char *progver = "1.64"; /* program version */
+char *progver = "1.66"; /* program version */
char *progname = "sgdiag"; /* program name */
char logfile[] = "/var/log/sgdiag.log"; /* log filename */
char model[20] = ""; /* default model string */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scsirastools-1.6.4/src/sgdiskmon.c
new/scsirastools-1.6.6/src/sgdiskmon.c
--- old/scsirastools-1.6.4/src/sgdiskmon.c 2011-08-23 15:26:05.000000000
+0200
+++ new/scsirastools-1.6.6/src/sgdiskmon.c 2016-05-22 04:08:56.000000000
+0200
@@ -78,7 +78,7 @@
//////////////////////////////////////////////////////////////////////
// Global Data
//////////////////////////////////////////////////////////////////////
-char *progver = "1.64"; /* program version */
+char *progver = "1.66"; /* program version */
char *progname = "sgdiskmon"; /* program name */
char sgevtcmd[] = "/sbin/sgevt";
char initscript[] = "/etc/init.d/sgdisk";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scsirastools-1.6.4/src/sgdskfl.c
new/scsirastools-1.6.6/src/sgdskfl.c
--- old/scsirastools-1.6.4/src/sgdskfl.c 2011-08-23 15:26:05.000000000
+0200
+++ new/scsirastools-1.6.6/src/sgdskfl.c 2016-05-22 04:08:56.000000000
+0200
@@ -117,7 +117,7 @@
#define MAX_MODELSZ 20
/* Global data definitions */
-char *progver = "1.64"; /* program version */
+char *progver = "1.66"; /* program version */
char *progname = "sgdskfl"; /* program name */
char logfile[] = "/var/log/sgdskfl.log"; /* log filename */
char fwsufx[] = ".lod"; /* suffix for firmware image filenames
*/
Binary files old/scsirastools-1.6.4/src/sgerr and
new/scsirastools-1.6.6/src/sgerr differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scsirastools-1.6.4/src/sgmode.c
new/scsirastools-1.6.6/src/sgmode.c
--- old/scsirastools-1.6.4/src/sgmode.c 2011-08-23 15:26:05.000000000 +0200
+++ new/scsirastools-1.6.6/src/sgmode.c 2016-05-22 04:08:56.000000000 +0200
@@ -107,7 +107,7 @@
#define SZ_MDFILE 132
/* Global data definitions */
-char *progver = "1.64"; /* program version */
+char *progver = "1.66"; /* program version */
char *progname = "sgmode"; /* program name */
char logfile[] = "/var/log/sgmode.log"; /* log filename */
char mdsufx[] = ".mdf"; /* suffix for mode format filenames */
@@ -513,7 +513,7 @@
uchar *out_buffer;
uchar sel_buffer[0x110];
uchar tch[60];
- char line[100];
+ char line[160];
char scratch[80];
char *pmdfile;
ulong nb1, sb1, nb2, sb2;
@@ -549,7 +549,7 @@
from mode sense is reserved for mode select so mask it out. */
sel_buffer[2] = sel_buffer[2] & 0xEF;
/* Set up MODE SELECT Block Descriptor (BD) */
- result = fgets(line, 80, fp1);
+ result = fgets(line, sizeof(line), fp1);
if (strchr(result, ':') != NULL) {
/* if ':' is found, there is BD in Mode data file */
/* Assumption: all BD data are in one line */
@@ -613,18 +613,16 @@
}
printf("Writing mode pages ");
/* Read in the pages from the definition file */
- while ((result = fgets(line, 80, fp1)) != NULL) {
+ while ((result = fgets(line, sizeof(line), fp1)) != NULL) {
int maxl;
- maxl = 0x18;
+ maxl = 0x40; /* =64. bytes max per line */
/* set i to start of mode page */
i = 4 + sel_buffer[3]; /* mode param hdr =4 + BD size, usu =8 */
for (j = i; j < 0x100; j++)
sel_buffer[j] = ' ';
- if (sscanf
- (result, "%02x %02x", (uint *) tch,
- (uint *) (tch + 1)) != 2) {
- fprintf(fdmsg,
- "Error in reading Page Code & Page Length. ");
+ k = sscanf(result,"%02x %02x", (uint *)tch, (uint *)(tch + 1));
+ if (k != 2) {
+ fprintf(fdmsg, "Error reading next Page Code & Length. ");
fprintf(fdmsg, "Aborting MODE SELECT.\n");
break; /* from this while() loop, hence go to next target */
}
@@ -636,10 +634,10 @@
m = 5 + sel_buffer[3]; /* set m to get byte #1 of page */
for (k = 0; (uchar)k < sel_buffer[m]; k++, i++, j++) {
if ((j % maxl) == 0) /*MODE SENSE page data exceeds one line*/
- result = fgets(line, 80, fp1);
+ result = fgets(line, sizeof(line), fp1);
l1 = j % maxl;
- if (sscanf(result + 3 * l1, "%02x", (uint *) (tch + l1)) !=
- 1) {
+ if (sscanf(result + 3 * l1, "%02x", (uint *) (tch + l1)) != 1)
+ {
showlog( "Error in reading data on page 0x%02x. ",
sel_buffer[m - 1]);
showlog( "Aborting MODE SELECT for this page.\n");
@@ -655,7 +653,7 @@
l2 = ((sel_buffer[m] + 2 - 1) / maxl) + 1;
/* # of lines for this page */
for (l = l1; l < l2; l++)
- result = fgets(line, 80, fp1); /* get unread lines */
+ result = fgets(line, sizeof(line), fp1); /* get unread
lines */
}
continue; /* the while() loop, hence go to next page */
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scsirastools-1.6.4/src/sgraidmon.c
new/scsirastools-1.6.6/src/sgraidmon.c
--- old/scsirastools-1.6.4/src/sgraidmon.c 2011-08-23 15:26:05.000000000
+0200
+++ new/scsirastools-1.6.6/src/sgraidmon.c 2016-05-22 04:08:56.000000000
+0200
@@ -150,7 +150,7 @@
//////////////////////////////////////////////////////////////////////
// Global Data
//////////////////////////////////////////////////////////////////////
-char *progver = "1.64"; /* program version */
+char *progver = "1.66"; /* program version */
char *progname = "sgraidmon"; /* program name */
char mdevtcmd[] = "/sbin/mdevt";
char initscript[] = "/etc/init.d/sgraid";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scsirastools-1.6.4/src/sgsafte.c
new/scsirastools-1.6.6/src/sgsafte.c
--- old/scsirastools-1.6.4/src/sgsafte.c 2011-08-23 15:26:05.000000000
+0200
+++ new/scsirastools-1.6.6/src/sgsafte.c 2016-05-22 04:08:56.000000000
+0200
@@ -59,7 +59,7 @@
//////////////////////////////////////////////////////////////////////
// Global Data
//////////////////////////////////////////////////////////////////////
-char *progver = "1.64"; /* program version */
+char *progver = "1.66"; /* program version */
char *progname = "sgsafte"; /* program name */
char logfile[] = "/var/log/sgsafte.log"; /* log filename */
FILE *fdlog = NULL; /* log file descriptor */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scsirastools-1.6.4/src/sgsub.c
new/scsirastools-1.6.6/src/sgsub.c
--- old/scsirastools-1.6.4/src/sgsub.c 2011-08-23 15:26:05.000000000 +0200
+++ new/scsirastools-1.6.6/src/sgsub.c 2016-05-22 04:06:04.000000000 +0200
@@ -655,13 +655,17 @@
int mode_select(int sgfd, uchar * buf, uchar len)
{
uchar cdb[6] = { 0x15, 0x11, 0, 0, 0x1C, 0 };
- int max_data = 50; /* max len for each page is 4+8+2+ 0x16 = 36. */
- uchar modebuf[HDR + 60];
+ int max_data = 64; /* max len for each page is usu: 4+8+2+ 0x16 = 36. */
+ uchar modebuf[HDR + 70]; /* HDR + 6 + max_data */
struct sg_header *sghp = (struct sg_header *) modebuf;
int ret, sts = 0;
int cmdlen;
- if (len > max_data) len = max_data;
+ if (len > max_data) {
+ if (fdebugsub)
+ showdbg( "mode_select: len=%d truncated to max %d\n", len,max_data);
+ len = max_data;
+ }
cmdlen = HDR + 6 + len;
sghp->reply_len = HDR;
sghp->twelve_byte = 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/scsirastools-1.6.4/src/sgsubmon.c
new/scsirastools-1.6.6/src/sgsubmon.c
--- old/scsirastools-1.6.4/src/sgsubmon.c 2011-08-23 15:26:05.000000000
+0200
+++ new/scsirastools-1.6.6/src/sgsubmon.c 2016-05-22 04:08:04.000000000
+0200
@@ -34,6 +34,7 @@
*---------------------------------------------------------------------------*/
#include <sys/types.h>
#include <sys/stat.h>
+#include <sys/sysmacros.h>
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
++++++ scsirastools-add-systemd-support.patch ++++++
--- /var/tmp/diff_new_pack.dDoFmm/_old 2023-01-29 14:18:35.661553495 +0100
+++ /var/tmp/diff_new_pack.dDoFmm/_new 2023-01-29 14:18:35.661553495 +0100
@@ -1,29 +1,3 @@
-Index: scsirastools-1.6.4/src/sgcommon.c
-===================================================================
---- scsirastools-1.6.4.orig/src/sgcommon.c
-+++ scsirastools-1.6.4/src/sgcommon.c
-@@ -72,6 +72,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
- #include <errno.h>
- #include <sys/ioctl.h>
- #include <fcntl.h>
-+#include <sys/sysmacros.h>
- #include "sgsub.h"
- #include "sgcommon.h"
-
-Index: scsirastools-1.6.4/src/sgsubmon.c
-===================================================================
---- scsirastools-1.6.4.orig/src/sgsubmon.c
-+++ scsirastools-1.6.4/src/sgsubmon.c
-@@ -45,6 +45,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
- #include <time.h>
- #include <sys/ioctl.h>
- #include <scsi/sg.h>
-+#include <sys/sysmacros.h>
-
- #define PATH_MAX 64
- #include <dirent.h>
-Index: scsirastools-1.6.4/files/sgdisk
-===================================================================
--- scsirastools-1.6.4.orig/files/sgdisk
+++ scsirastools-1.6.4/files/sgdisk
@@ -15,7 +15,7 @@
