2010-10-17 Albert Lee <
[email protected]>
* SFEboost-gpp.spec: Remove SUNWicu* dependencies added in error.
* SFEettercap.spec: Update dependencies. Do not require gcc. Add patch1,
patch2.
* SFEfuse-exfat.spec: Bump to 0.9.2, drop upstreamed patches. Support
SFEfusefs.
* patches/ettercap-NG-01-nogcc.diff: Avoid gcc-specific flags.
* patches/ettercap-NG-02-debian-521857.diff: Fix Debian #521857.
* patches/fuse-exfat-01-sconstruct.diff,
patches/fuse-exfat-02-byteorder.diff: Deleted.
--- a/ChangeLog Sat Oct 16 12:33:14 2010 +0000
+++ b/ChangeLog Sun Oct 17 14:49:44 2010 +0000
@@ -1,3 +1,15 @@
+2010-10-17 Albert Lee <[email protected]>
+
+ * SFEboost-gpp.spec: Remove SUNWicu* dependencies added in error.
+ * SFEettercap.spec: Update dependencies. Do not require gcc. Add patch1,
+ patch2.
+ * SFEfuse-exfat.spec: Bump to 0.9.2, drop upstreamed patches. Support
+ SFEfusefs.
+ * patches/ettercap-NG-01-nogcc.diff: Avoid gcc-specific flags.
+ * patches/ettercap-NG-02-debian-521857.diff: Fix Debian #521857.
+ * patches/fuse-exfat-01-sconstruct.diff,
+ patches/fuse-exfat-02-byteorder.diff: Deleted.
+
2010-10-16 Milan Jurik <[email protected]>
* SFEnodejs.spec: bump to 0.2.3
@@ -9,6 +21,7 @@
* base-specs/ncursesw.spec: Bump to 5.7.
* SFEvorbis-tools.spec: Bump to 1.4.0
+>>>>>>> .r2964
2010-10-13 Smin Jin <[email protected]>
* SFEwebkitgtk.spec:
@@ -49,6 +62,7 @@
* SFElibebml.spec: Updated to 1.0.0
* SFElibmatroska.spec: Updated to 1.0.0
+>>>>>>> .r2962
2010-10-09 Jeff Cai <[email protected]>
* SFEfarsight2.spec:
@@ -125,6 +139,7 @@
* SFEgnumeric.spec, SFEliblouis.spec: Remove .la and .a files.
+>>>>>>> .r2954
2010-09-24 Milan Jurik <[email protected]>
* SFErubygem-dnsruby.spec: bump to 1.50
--- a/SFEboost-gpp.spec Sat Oct 16 12:33:14 2010 +0000
+++ b/SFEboost-gpp.spec Sun Oct 17 14:49:44 2010 +0000
@@ -17,9 +17,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%include default-depend.inc
-BuildRequires: SUNWicud
BuildRequires: SUNWPython
-Requires: SUNWicu
%package devel
Summary: %{summary} - development files
@@ -73,6 +71,8 @@
%{sfw_inc}/c++/%{_gpp_version}/boost
%changelog
+* Mon May 17 2010 - Albert Lee <[email protected]>
+- Remove SUNWicu* dependencies added in error
* Sat Jan 30 2010 - Brian Cameron <[email protected]>
- Install header files, so it isn't necessary to install the Sun Studio
version of boost to access these.
--- a/SFEettercap.spec Sat Oct 16 12:33:14 2010 +0000
+++ b/SFEettercap.spec Sun Oct 17 14:49:44 2010 +0000
@@ -13,20 +13,30 @@
Summary: MITM LAN attack prevention suite; includes graphical (gtk) support
Version: 0.7.3
Source: %{sf_download}/ettercap/ettercap-NG-%{version}.tar.gz
+Patch1: patches/ettercap-NG-01-nogcc.diff
+Patch2: patches/ettercap-NG-02-debian-521857.diff
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%include default-depend.inc
-BuildRequires: SUNWGtku
-BuildRequires: SUNWxwxft
-BuildRequires: SFElibpcap-devel
-# Note: Apparently libnet is incapable of producing a shared lib...
-BuildRequires: SFElibnet-devel
+BuildRequires: SUNWgtk2-devel
+BuildRequires: SUNWxwinc
+BuildRequires: SUNWncurses-devel
+BuildRequires: SUNWlibpcap
+BuildRequires: SUNWlibnet
+BuildRequires: SUNWopenssl-include
+BuildRequires: SUNWzlib
+BuildRequires: SUNWltdl
#
-Requires: SUNWGtku
-Requires: SUNWxwxft
-Requires: SFElibpcap
+Requires: SUNWgtk2
+Requires: SUNWxwplt
+Requires: SUNWncurses
+Requires: SUNWlibpcap
+Requires: SUNWlibnet
+Requires: SUNWopenssl-libraries
+Requires: SUNWzlib
+Requires: SUNWltdl
Requires: %name-root
%package root
@@ -36,20 +46,22 @@
%prep
%setup -q -n ettercap-NG-%version
+%patch1 -p1
+%patch2 -p1
+# fix struct initialisers
+find plug-ins -name '*.c' -exec perl -pi -e 's, (ettercap_version|name|info|version|init|fini): ( *),.\1 = \2,' {} ';'
%build
-
CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
if test "x$CPUS" = "x" -o $CPUS = 0; then
CPUS=1
fi
-# This source is gcc-centric, therefore...
-export CC=/usr/sfw/bin/gcc
-# export CFLAGS="%optflags"
-export CFLAGS="-O4 -fPIC -DPIC -Xlinker -i -fno-omit-frame-pointer"
-
-export LDFLAGS="%_ldflags"
+autoconf
+export CFLAGS="%optflags"
+# Workaround for bad check in libnet/libnet-types.h: #if (__sun__ && __svr4__)
+export CPPFLAGS="-I%{xorg_inc} -D__sun__=1 -D__svr4__=1"
+export LDFLAGS="%_ldflags %{xorg_lib_path} %{gnu_lib_path}"
./configure --prefix=%{_prefix} \
--bindir=%{_bindir} \
@@ -57,12 +69,8 @@
--datadir=%{_datadir} \
--libexecdir=%{_libexecdir} \
--mandir=%{_mandir} \
- --enable-gtk \
- --sysconfdir=%{_sysconfdir}
-
-# I'm pretty sure that if ncurses and/or pcre are installed,
-# those features will be automatically enabled at build-time.
-# (not tested though.)
+ --sysconfdir=%{_sysconfdir} \
+ --enable-gtk
make -j$CPUS
@@ -71,7 +79,7 @@
make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/ettercap/*.la
+find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.a" -exec rm -f {} ';'
%clean
rm -rf $RPM_BUILD_ROOT
@@ -90,6 +98,10 @@
%{_sysconfdir}/*
%changelog
+* Tue Jul 20 2010 - Albert Lee <[email protected]>
+- Update dependencies
+- Do not require gcc
+- Add patch1, patch2
* Sat Apr 21 2007 - [email protected]
- Added %{_libdir} to %files
* Mon Mar 19 2007 - [email protected]
--- a/SFEfuse-exfat.spec Sat Oct 16 12:33:14 2010 +0000
+++ b/SFEfuse-exfat.spec Sun Oct 17 14:49:44 2010 +0000
@@ -9,14 +9,13 @@
%include base.inc
%define SFEscons %(/usr/bin/pkg info scons >/dev/null 2>&1 && echo 0 || echo 1)
+%define SUNWlibfuse %(/usr/bin/pkginfo -q SUNWlibfuse && echo 1 || echo 0)
Name: SFEfuse-exfat
Summary: Free exFAT file system implementation
-Version: 0.9.1
+Version: 0.9.2
License: GPLv3
Source: http://exfat.googlecode.com/files/fuse-exfat-%{version}.tar.gz
-Patch1: fuse-exfat-01-sconstruct.diff
-Patch2: fuse-exfat-02-byteorder.diff
Url: http://code.google.com/p/exfat/
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -26,14 +25,19 @@
%if %SFEscons
BuildRequires: SFEscons
%endif
-BuildRequires: SUNWlibfuse
-Requires: SUNWfusefs
-Requires: SUNWlibfuse
+
+%if %SUNWlibfuse
+BuildRequires: SUNWlibfuse
+Requires: SUNWfusefs
+Requires: SUNWlibfuse
+%else
+BuildRequires: SFElibfuse
+Requires: SFEfusefs
+Requires: SFElibfuse
+%endif
%prep
%setup -q -n fuse-exfat-%version
-%patch1 -p1
-%patch2 -p1
%build
@@ -67,5 +71,8 @@
%{_libdir}/fs/exfat/*
%changelog
+* Fri Sep 21 2010 - Albert Lee <[email protected]>
+- Bump to 0.9.2, drop upstreamed patches
+- Support SFEfusefs
* Fri Jun 18 2010 - Albert Lee <[email protected]>
- Initial spec
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ettercap-NG-01-nogcc.diff Sun Oct 17 14:49:44 2010 +0000
@@ -0,0 +1,29 @@
+--- ettercap-NG-0.7.3.orig/configure.in 2005-01-13 04:24:28.000000000 -0500
++++ ettercap-NG-0.7.3/configure.in 2010-07-20 09:54:26.671584378 -0400
+@@ -328,17 +328,23 @@
+ [ case "$enableval" in
+ yes)
+ AC_DEFINE(DEBUG, 1)
+- DEBUG_FLAGS="-g -ggdb -Wmissing-prototypes -Wno-uninitialized -Werror -Wformat-security -Wsign-compare -Wall"
++ if test "x$GCC" = xyes; then
++ DEBUG_FLAGS="-g -ggdb -Wmissing-prototypes -Wno-uninitialized -Werror -Wformat-security -Wsign-compare -Wall"
++ fi
+ AC_MSG_RESULT(yes)
+ ac_ec_debug=yes
+ ;;
+ no) AC_MSG_RESULT(no)
+- DEBUG_FLAGS="-O2 -funroll-loops -fomit-frame-pointer -Wall"
++ if test "x$GCC" = xyes; then
++ DEBUG_FLAGS="-O2 -funroll-loops -fomit-frame-pointer -Wall"
++ fi
+ ac_ec_debug=no
+ ;;
+ esac ],
+ AC_MSG_RESULT(no)
+- DEBUG_FLAGS="-O2 -funroll-loops -fomit-frame-pointer -Wall"
++ if test "x$GCC" = xyes; then
++ DEBUG_FLAGS="-O2 -funroll-loops -fomit-frame-pointer -Wall"
++ fi
+ ac_ec_debug=no
+ )
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ettercap-NG-02-debian-521857.diff Sun Oct 17 14:49:44 2010 +0000
@@ -0,0 +1,16 @@
+See debian bug #521857, patch from Timothy Redaelli <[email protected]>
+
+--- ettercap-0.7.3.orig/src/protocols/ec_tcp.c
++++ ettercap-0.7.3/src/protocols/ec_tcp.c
+@@ -116,7 +116,7 @@
+ tcp = (struct tcp_header *)DECODE_DATA;
+
+ opt_start = (u_char *)(tcp + 1);
+- opt_end = (u_char *)((int)tcp + tcp->off * 4);
++ opt_end = (u_char *)(tcp + tcp->off * 4);
+
+ DECODED_LEN = (u_int32)(tcp->off * 4);
+
+See debian bug #521857, patch from Timothy Redaelli <[email protected]>
+
+--- ettercap-0.7.3.orig/src/protocols/ec_tcp.
--- a/patches/fuse-exfat-01-sconstruct.diff Sat Oct 16 12:33:14 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-Index: SConstruct
-===================================================================
---- a/SConstruct (revision 144)
-+++ b/SConstruct (working copy)
-@@ -25,12 +25,14 @@
- # in it's headers inode numbers are 64-bit by default, but libfuse operates
- # 32-bit inode numbers. It's also possible to link against libfuse_ino64
- # instead.
--cflags = '-Wall -O2 -ggdb -D_FILE_OFFSET_BITS=64 -D__DARWIN_64_BIT_INO_T=0 -Ilibexfat'
--ldflags = ''
-+env = Environment(**ARGUMENTS)
-+env.Append(CPPDEFINES = {'_FILE_OFFSET_BITS' : 64, '__DARWIN_64_BIT_INO_T' : 0})
-+env.Append(CPPDEFINES = {'FUSE_USE_VERSION': 26})
-+env.Append(CPPPATH = ['libexfat'])
-
--Library('libexfat/exfat', Glob('libexfat/*.c'), CFLAGS = cflags, LINKFLAGS = ldflags)
--fsck = Program('fsck/exfatck', Glob('fsck/*.c'), CFLAGS = cflags, LINKFLAGS = ldflags, LIBS = ['exfat'], LIBPATH = 'libexfat')
--mount = Program('fuse/mount.exfat-fuse', Glob('fuse/*.c'), CFLAGS = cflags + ' -DFUSE_USE_VERSION=26', LINKFLAGS = ldflags, LIBS = ['exfat', 'fuse'], LIBPATH = 'libexfat')
-+env.Library('libexfat/exfat', Glob('libexfat/*.c'))
-+fsck = env.Program('fsck/exfatck', Glob('fsck/*.c'), LIBS = ['exfat'], LIBPATH = 'libexfat')
-+mount = env.Program('fuse/mount.exfat-fuse', Glob('fuse/*.c'), LIBS = ['exfat', 'fuse'], LIBPATH = 'libexfat')
-
- def get_destdir():
- try:
--- a/patches/fuse-exfat-02-byteorder.diff Sat Oct 16 12:33:14 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-Index: libexfat/byteorder.h
-===================================================================
---- a/libexfat/byteorder.h (revision 144)
-+++ b/libexfat/byteorder.h (working copy)
-@@ -33,10 +33,40 @@
- #define __BYTE_ORDER BYTE_ORDER
- #define __LITTLE_ENDIAN LITTLE_ENDIAN
- #define __BIG_ENDIAN BIG_ENDIAN
--#else
-+#elif defined(__FreeBSD__) || defined(__DragonFlyBSD__) || defined(__NetBSD__)
-+#include <sys/endian.h>
-+#define bswap_16(x) bswap16(x)
-+#define bswap_32(x) bswap32(x)
-+#define bswap_64(x) bswap64(x)
-+#define __BYTE_ORDER _BYTE_ORDER
-+#define __LITTLE_ENDIAN _LITTLE_ENDIAN
-+#define __BIG_ENDIAN _BIG_ENDIAN
-+#elif defined(__OpenBSD__)
-+#include <machine/endian.h>
-+#define bswap_16(x) swap16(x)
-+#define bswap_32(x) swap32(x)
-+#define bswap_64(x) swap64(x)
-+#define __BYTE_ORDER _BYTE_ORDER
-+#define __LITTLE_ENDIAN _LITTLE_ENDIAN
-+#define __BIG_ENDIAN _BIG_ENDIAN
-+#elif defined(__GLIBC__)
- #include <endian.h>
- #include <byteswap.h>
-+#elif defined(__sun)
-+#include <sys/byteorder.h>
-+#define bswap_16(x) BSWAP_16(x)
-+#define bswap_32(x) BSWAP_32(x)
-+#define bswap_64(x) BSWAP_64(x)
-+#define __LITTLE_ENDIAN 1234
-+#define __BIG_ENDIAN 4321
-+#ifdef _LITTLE_ENDIAN
-+#define __BYTE_ORDER __LITTLE_ENDIAN
-+#else
-+#define __BYTE_ORDER __BIG_ENDIAN
- #endif
-+#else
-+#error Don't have byte order macros for your platform!
-+#endif
-
- typedef struct { uint16_t __u16; } le16_t;
- typedef struct { uint32_t __u32; } le32_t;
-@@ -64,5 +94,4 @@
- #else
- #error Wow! You have a PDP machine?!
- #endif
--
- #endif /* ifndef BYTEORDER_H_INCLUDED */