diffstat for e2fsprogs_1.41.12-2 e2fsprogs_1.41.12-2stormos0

 MCONFIG.in                                                   |    2 -
 debian/source/usr/share/lintian/overrides/source             |    3 +
 debian/uuid-runtime/usr/share/lintian/overrides/uuid-runtime |    1 
 e2fsprogs-1.41.12/debian/changelog                           |    6 +++
 e2fsprogs-1.41.12/debian/rules                               |   22 +++++++++--
 lib/uuid/gen_uuid.c                                          |    2 -
 6 files changed, 31 insertions(+), 5 deletions(-)

diff -u e2fsprogs-1.41.12/debian/changelog e2fsprogs-1.41.12/debian/changelog
--- e2fsprogs-1.41.12/debian/changelog
+++ e2fsprogs-1.41.12/debian/changelog
@@ -1,3 +1,9 @@
+e2fsprogs (1.41.12-2stormos0) unstable; urgency=high
+
+  * Package for StormOS.
+
+ -- Andrew Stormont (astormont) <andyjstormont@googlemail.com>  Sun, 15 Aug 2010 09:53:30 +0200
+
 e2fsprogs (1.41.12-2) unstable; urgency=high
 
   * Allow tune2fs to set uninit_bg without requiring an fsck
diff -u e2fsprogs-1.41.12/debian/rules e2fsprogs-1.41.12/debian/rules
--- e2fsprogs-1.41.12/debian/rules
+++ e2fsprogs-1.41.12/debian/rules
@@ -118,6 +118,10 @@
 CFLAGS += -D__NO_STRING_INLINES
 endif
 
+ifeq (${DEB_HOST_ARCH_OS},solaris)
+CFLAGS += -std=c99
+endif
+
 ifeq (${DEB_HOST_ARCH_OS},linux)
 BUILD_STATIC = build-static
 E2FSCK_STATIC = ${staticbuilddir}/e2fsck/e2fsck.static
@@ -128,10 +132,14 @@
 BF_CFLAGS = -Os -fomit-frame-pointer
 
 COMMON_CONF_FLAGS =  \
-                --enable-elf-shlibs --infodir=/usr/share/info
+                --enable-elf-shlibs --infodir=/usr/share/info 
+
+ifeq ($(DEB_HOST_ARCH_OS),solaris)
+COMMON_CONF_FLAGS += --mandir=$(MANDIR) --sysconfdir=/etc --prefix=/usr --libdir=/lib --sbindir=/sbin
+endif
+
 ifeq ($(UTIL_LINUX_NG),yes)
-COMMON_CONF_FLAGS += --disable-fsck --disable-libblkid \
-			--disable-libuuid --disable-uuidd
+COMMON_CONF_FLAGS += --disable-fsck --disable-libblkid --disable-libuuid --disable-uuidd
 else
 COMMON_CONF_FLAGS += --enable-fsck
 endif
@@ -322,6 +330,14 @@
   # static libs and .h files
 	$(MAKE) -C ${stdbuilddir} install-libs DESTDIR=${tmpdir} LDCONFIG=true
 
+  # fix the install location on solaris
+ifeq ($(DEB_HOST_ARCH_OS),solaris)
+	mkdir debian/tmp/usr/lib debian/tmp/usr/sbin
+	mv debian/tmp/sbin/{mklost+found,filefrag,e2freefrag} debian/tmp/usr/sbin
+	mv debian/tmp/lib/lib*.{a,so} debian/tmp/usr/lib
+	mv debian/tmp/lib/pkgconfig debian/tmp/lib/e2initrd_helper debian/tmp/usr/lib
+endif
+
   # statically-linked fsck
 	${INSTALL_PROGRAM} $(E2FSCK_STATIC) ${tmpdir}/sbin
 	cp ${mandir}/man8/e2fsck.8 ${mandir}/man8/e2fsck.static.8
only in patch2:
unchanged:
--- e2fsprogs-1.41.12.orig/MCONFIG.in
+++ e2fsprogs-1.41.12/MCONFIG.in
@@ -54,7 +54,7 @@
 INTL_FLAGS = @INTL_FLAGS@
 ALL_CFLAGS = $(CPPFLAGS) $(DEFS) $(USE_WFLAGS) $(CFLAGS) $(XTRA_CFLAGS) \
 	$(INTL_FLAGS) $(LINUX_INCLUDE) 
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ @SOCKET_LIB@
 ALL_LDFLAGS = $(LDFLAGS) @LDFLAG_DYNAMIC@
 LDFLAGS_STATIC = $(LDFLAGS) @LDFLAG_STATIC@
 BUILD_CFLAGS = @BUILD_CFLAGS@
only in patch2:
unchanged:
--- e2fsprogs-1.41.12.orig/debian/uuid-runtime/usr/share/lintian/overrides/uuid-runtime
+++ e2fsprogs-1.41.12/debian/uuid-runtime/usr/share/lintian/overrides/uuid-runtime
@@ -0,0 +1 @@
+uuid-runtime: command-with-path-in-maintainer-script prerm:5 /usr/sbin/uuidd
only in patch2:
unchanged:
--- e2fsprogs-1.41.12.orig/debian/source/usr/share/lintian/overrides/source
+++ e2fsprogs-1.41.12/debian/source/usr/share/lintian/overrides/source
@@ -0,0 +1,3 @@
+e2fsprogs source: weak-library-dev-dependency ss-dev on libss2 (= ${mainBinary})
+e2fsprogs source: weak-library-dev-dependency comerr-dev on libcomerr2 (= ${mainBinary})
+e2fsprogs source: weak-library-dev-dependency uuid-dev on libuuid1 (= ${mainBinary})
only in patch2:
unchanged:
--- e2fsprogs-1.41.12.orig/lib/uuid/gen_uuid.c
+++ e2fsprogs-1.41.12/lib/uuid/gen_uuid.c
@@ -261,7 +261,7 @@
 	for (i = 0; i < n; i+= ifreq_size(*ifrp) ) {
 		ifrp = (struct ifreq *)((char *) ifc.ifc_buf+i);
 		strncpy(ifr.ifr_name, ifrp->ifr_name, IFNAMSIZ);
-#ifdef SIOCGIFHWADDR
+#if defined(SIOCGIFHWADDR) && !defined(__sun)
 		if (ioctl(sd, SIOCGIFHWADDR, &ifr) < 0)
 			continue;
 		a = (unsigned char *) &ifr.ifr_hwaddr.sa_data;