Date: Tue, 17 May 2011 07:55:08 -0400 From: Jason Hellenthal <jhell@DataIX.net> To: marcus@FreeBSD.org Cc: ports@FreeBSD.org Subject: Wireshark 1.6.0rc1 Message-ID: <20110517115508.GA65478@DataIX.net>
next in thread | raw e-mail | index | archive | help
--xXmbgvnjoT4axfJE Content-Type: multipart/mixed; boundary="cWoXeonUoKmBZSoM" Content-Disposition: inline --cWoXeonUoKmBZSoM Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Marcus, Thought I would just give you a heads up on this. patch-configure looks like it was 1/2 consumed upstream in 1.6.0rc1 maybe in other versions as well but I have not looked at those as I am only working with the latest version here. I attached the patch just to show the differences for reference. Ports, In case anyone would like to travel through time to the newest version of Wireshark, version listed in subject and above, I have uploaded a tarball to [1] which you can use to play with if your interested. A GnuPG signature[2] has also be uploaded there too. 1). http://jhell.googlecode.com/files/wireshark-devel.tar 2). http://jhell.googlecode.com/files/wireshark-devel.tar.asc --=20 Regards, (jhell) Jason Hellenthal --cWoXeonUoKmBZSoM Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="patch-configure.diff" Content-Transfer-Encoding: quoted-printable --- net/wireshark/files/patch-configure.orig 2011-05-17 07:09:56.000000000 = -0400 +++ net/wireshark/files/patch-configure 2011-05-17 07:12:40.000000000 -0400 @@ -1,24 +1,6 @@ ---- configure.orig 2010-08-29 18:20:30.000000000 -0400 -+++ configure 2010-09-04 17:19:07.000000000 -0400 -@@ -18072,7 +18072,7 @@ $as_echo_n "checking whether we should t - # Check whether --enable-warnings-as-errors was given. - if test "${enable_warnings_as_errors+set}" =3D set; then : - enableval=3D$enable_warnings_as_errors; -- if test "x$GCC" =3D "xyes" -a "x$enableval" =3D=3D "xyes" -a "x$wiresha= rk_extra_gcc_flags" !=3D "xyes"; then -+ if test "x$GCC" =3D "xyes" -a "x$enableval" =3D "xyes" -a "x$wireshark_= extra_gcc_flags" !=3D "xyes"; then - with_warnings_as_errors=3D"yes" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } -@@ -19660,7 +19660,7 @@ fi -=20 - fi -=20 -- if test x$have_ige_mac =3D=3D x -+ if test x$have_ige_mac =3D x - then - # - # Not found - check for the old integration functions in -@@ -22487,7 +22487,7 @@ $as_echo "yes" >&6; } +--- configure.orig 2011-05-17 07:02:03.000000000 -0400 ++++ configure 2011-05-17 07:08:58.000000000 -0400 +@@ -23111,7 +23111,7 @@ # CFLAGS=3D"$CFLAGS -I$krb5_dir/include" CPPFLAGS=3D"$CPPFLAGS -I$krb5_dir/include" @@ -27,7 +9,7 @@ # MIT Kerberos moved krb5.h to krb5/krb5.h starting with release 1.5 ac_mit_version_olddir=3D`grep 'Massachusetts Institute of Technology' = $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*Massachusetts Institute of= Technology.*$/MIT/'` ac_mit_version_newdir=3D`grep 'Massachusetts Institute of Technology' = $krb5_dir/include/krb5/krb5.h | head -n 1 | sed 's/^.*Massachusetts Institu= te of Technology.*$/MIT/'` -@@ -22546,7 +22546,7 @@ fi +@@ -23170,7 +23170,7 @@ =20 if test -x "$KRB5_CONFIG" then --cWoXeonUoKmBZSoM-- --xXmbgvnjoT4axfJE Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (FreeBSD) Comment: http://bit.ly/0x89D8547E iQEcBAEBAgAGBQJN0mIbAAoJEJBXh4mJ2FR+4/0H/1ZydtBTUnnqhU2U94rIbxyC pIlT8n50LKAYLVWCC0jQ0nkCOgBEc0zK3QkTf8T4IhoGtyRBPf87gKcacWysV9xV s8/r7YLBISgbK8wypcVR8jyndb195bVOUoWd/ra8dul0mtRZ8nwnLqFHhA3CFuTk phLO8bKjWEJg71x5UhrMARxVMcLF8C3lzNg0GuCbJQ0uwWVU2nFiELVBG4EK3o4W FBJPI0b4tvlcUUE1SeiDlbJt8HYW6Uo1hBG57xVU79Yk+fbp4MI2k3MNCkw+cpu/ ZP/a2OUd6UPph0DQ6Sy65r8Y3dJAWQEO+MTQ/dqjIAS84vWqVcHjnbBurG9QQFM= =+mYw -----END PGP SIGNATURE----- --xXmbgvnjoT4axfJE--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110517115508.GA65478>