Update to 5.41, initial diff by robert at openbsd dot pap dot st
with tweaks by me.
This commit is contained in:
giovanni
parent
d050c3a89c
commit
a61d324385
@ -1,14 +1,12 @@
|
||||
# $OpenBSD: Makefile,v 1.15 2010/12/27 14:50:23 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.16 2011/06/21 08:48:34 giovanni Exp $
|
||||
|
||||
ONLY_FOR_ARCHS= amd64 i386 powerpc
|
||||
|
||||
COMMENT= control and monitor storage systems using SMART
|
||||
|
||||
DISTNAME= smartmontools-5.40
|
||||
DISTNAME= smartmontools-5.41
|
||||
CATEGORIES= sysutils
|
||||
|
||||
REVISION= 2
|
||||
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=smartmontools/}
|
||||
HOMEPAGE= http://smartmontools.sourceforge.net/
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (smartmontools-5.40.tar.gz) = DwvgI5kUrYeDCk//WUvaWw==
|
||||
RMD160 (smartmontools-5.40.tar.gz) = /y6/0TAYK6chJI6/69nU1cwyX/Q=
|
||||
SHA1 (smartmontools-5.40.tar.gz) = CKhqk5ouLNhdLIjAkYjUlPBs4FA=
|
||||
SHA256 (smartmontools-5.40.tar.gz) = KmjtINXWvRmOGqa/C2A38PIW47FNoCIRUkTxr50ki/0=
|
||||
SIZE (smartmontools-5.40.tar.gz) = 705592
|
||||
MD5 (smartmontools-5.41.tar.gz) = RXeIa+p51P8SvZp9Mjzmkg==
|
||||
RMD160 (smartmontools-5.41.tar.gz) = 0t5RLvZNzrYaH5wDhLDqiV/THjY=
|
||||
SHA1 (smartmontools-5.41.tar.gz) = bPXGYNFz27lPrjVJrGicZCfRjqM=
|
||||
SHA256 (smartmontools-5.41.tar.gz) = Fz6xTjJTowIw84x+aECFvK5/oCHv/1i9+UwnAqx2+jI=
|
||||
SIZE (smartmontools-5.41.tar.gz) = 740661
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.6 2010/11/23 18:21:45 giovanni Exp $
|
||||
--- Makefile.in.orig Sat Oct 16 18:36:17 2010
|
||||
+++ Makefile.in Thu Oct 28 18:43:44 2010
|
||||
@@ -219,8 +219,8 @@ man5dir = $(mandir)/man5
|
||||
man8dir = $(mandir)/man8
|
||||
$OpenBSD: patch-Makefile_in,v 1.7 2011/06/21 08:48:34 giovanni Exp $
|
||||
--- Makefile.in.orig Thu Jun 9 20:47:52 2011
|
||||
+++ Makefile.in Mon Jun 20 09:41:35 2011
|
||||
@@ -239,8 +239,8 @@ man8dir = $(mandir)/man8
|
||||
NROFF = nroff
|
||||
MANS = $(man_MANS)
|
||||
-DATA = $(attributelog_DATA) $(docs_DATA) $(drivedb_DATA) $(initd_DATA) \
|
||||
- $(savestates_DATA) $(sysconf_DATA)
|
||||
+DATA = $(attributelog_DATA) $(docs_DATA) $(drivedb_DATA) \
|
||||
+ $(savestates_DATA)
|
||||
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
|
||||
distclean-recursive maintainer-clean-recursive
|
||||
AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
|
||||
@@ -442,15 +442,7 @@ EXTRA_smartctl_SOURCES = os_linux.cpp os_linux.h os_fr
|
||||
DATA = $(attributelog_DATA) $(docs_DATA) $(drivedb_DATA) \
|
||||
- $(examples_DATA) $(initd_DATA) $(savestates_DATA) \
|
||||
- $(sysconf_DATA) $(systemdsystemunit_DATA)
|
||||
+ $(examples_DATA) $(savestates_DATA) \
|
||||
+ $(systemdsystemunit_DATA)
|
||||
ETAGS = etags
|
||||
CTAGS = ctags
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
@@ -439,15 +439,7 @@ EXTRA_smartctl_SOURCES = os_linux.cpp os_linux.h os_fr
|
||||
@OS_SOLARIS_FALSE@ smartd.8
|
||||
|
||||
docsdir = $(docdir)
|
||||
@ -27,31 +27,5 @@ $OpenBSD: patch-Makefile_in,v 1.6 2010/11/23 18:21:45 giovanni Exp $
|
||||
- smartd.conf
|
||||
+docs_DATA = smartd.conf
|
||||
|
||||
sysconf_DATA = smartd.conf$(smartd_suffix)
|
||||
EXTRA_DIST = smartd.initd.in \
|
||||
@@ -1074,16 +1066,6 @@ uninstall-savestatesDATA:
|
||||
cd "$(DESTDIR)$(savestatesdir)" && rm -f $$files
|
||||
install-sysconfDATA: $(sysconf_DATA)
|
||||
@$(NORMAL_INSTALL)
|
||||
- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
|
||||
- @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
|
||||
- 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)$(sysconfdir)'"; \
|
||||
- $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \
|
||||
- done
|
||||
|
||||
uninstall-sysconfDATA:
|
||||
@$(NORMAL_UNINSTALL)
|
||||
@@ -1475,7 +1457,7 @@ info: info-recursive
|
||||
info-am:
|
||||
|
||||
install-data-am: install-attributelogDATA install-docsDATA \
|
||||
- install-drivedbDATA install-initdDATA install-man \
|
||||
+ install-drivedbDATA install-man \
|
||||
install-savestatesDATA
|
||||
|
||||
install-dvi: install-dvi-recursive
|
||||
examplesdir = $(exampledir)
|
||||
examples_DATA = \
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
$OpenBSD: patch-os_openbsd_cpp,v 1.1 2010/11/23 18:21:45 giovanni Exp $
|
||||
--- os_openbsd.cpp.orig Wed Jul 15 21:59:19 2009
|
||||
+++ os_openbsd.cpp Mon Nov 15 19:39:48 2010
|
||||
@@ -92,7 +92,7 @@ guess_device_type(const char *dev_name)
|
||||
int
|
||||
get_dev_names(char ***names, const char *prefix)
|
||||
{
|
||||
- char *disknames, *p, **mp;
|
||||
+ char *disknames, *p, *u, **mp;
|
||||
int n = 0;
|
||||
int sysctl_mib[2];
|
||||
size_t sysctl_len;
|
||||
@@ -121,6 +121,9 @@ get_dev_names(char ***names, const char *prefix)
|
||||
if (strncmp(p, prefix, strlen(prefix))) {
|
||||
continue;
|
||||
}
|
||||
+ char * u = strchr(p, ':');
|
||||
+ if (u)
|
||||
+ *u = 0;
|
||||
mp[n] = (char *)malloc(strlen(net_dev_prefix) + strlen(p) + 2);
|
||||
if (!mp[n]) {
|
||||
pout("Out of memory constructing scan device list\n");
|
||||
Loading…
Reference in New Issue
Block a user