diff options
author | dholland <dholland@pkgsrc.org> | 2012-06-18 03:28:55 +0000 |
---|---|---|
committer | dholland <dholland@pkgsrc.org> | 2012-06-18 03:28:55 +0000 |
commit | 2f105f6ddcf4fdc6514b157caf84216b0e5cba04 (patch) | |
tree | 694b8e515fc244f30078cad2ec961f684696b774 /devel | |
parent | 312d2d6dbff59ca33bf57abb07d21a23337267c1 (diff) | |
download | pkgsrc-2f105f6ddcf4fdc6514b157caf84216b0e5cba04.tar.gz |
Avoid strict-aliasing problems on Linux. Bump PKGREVISION as a precaution.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/sfslite/Makefile | 3 | ||||
-rw-r--r-- | devel/sfslite/distinfo | 3 | ||||
-rw-r--r-- | devel/sfslite/patches/patch-async_rwfd_c | 24 |
3 files changed, 28 insertions, 2 deletions
diff --git a/devel/sfslite/Makefile b/devel/sfslite/Makefile index 48e034d9cc5..48623414af1 100644 --- a/devel/sfslite/Makefile +++ b/devel/sfslite/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.1.1.1 2012/05/07 07:25:54 agc Exp $ +# $NetBSD: Makefile,v 1.2 2012/06/18 03:28:55 dholland Exp $ DISTNAME= sfslite-1.2.7 +PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_FREEBSD} diff --git a/devel/sfslite/distinfo b/devel/sfslite/distinfo index 675dbc44490..328db102a6b 100644 --- a/devel/sfslite/distinfo +++ b/devel/sfslite/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2012/05/07 07:25:55 agc Exp $ +$NetBSD: distinfo,v 1.2 2012/06/18 03:28:55 dholland Exp $ SHA1 (sfslite-1.2.7.tar.gz) = 774c1defc74d9f354622f60aa5c038400b401c5b RMD160 (sfslite-1.2.7.tar.gz) = 3e72a4d6cb0975c13b51f13ff615e8a390c36e3b @@ -6,3 +6,4 @@ Size (sfslite-1.2.7.tar.gz) = 1379432 bytes SHA1 (patch-aa) = 9c13092b1fe5e9d7c25eea9293fadbbaab096299 SHA1 (patch-ab) = 0bfc67711150e5dc8eb74fba29e9abd5272e62db SHA1 (patch-ac) = 88294e8dc9785a68019f66d0513c6d043a6b9f2e +SHA1 (patch-async_rwfd_c) = be0075129d6bfe3eda7f86721a8a977acd5296d2 diff --git a/devel/sfslite/patches/patch-async_rwfd_c b/devel/sfslite/patches/patch-async_rwfd_c new file mode 100644 index 00000000000..5afd3ce97b4 --- /dev/null +++ b/devel/sfslite/patches/patch-async_rwfd_c @@ -0,0 +1,24 @@ +$NetBSD: patch-async_rwfd_c,v 1.1 2012/06/18 03:28:55 dholland Exp $ + +Avoid strict-aliasing warnings on Linux. + +--- async/rwfd.c~ 2009-02-12 13:20:42.000000000 +0000 ++++ async/rwfd.c +@@ -51,7 +51,7 @@ writevfd (int fd, const struct iovec *io + cmh->cmsg_level = SOL_SOCKET; + cmh->cmsg_type = SCM_RIGHTS; + cmh->cmsg_len = CMSG_LEN(sizeof(int)); +- *(int *)CMSG_DATA(cmh) = wfd; ++ memcpy(CMSG_DATA(cmh), &wfd, sizeof(int)); + #else /* !HAVE_CMSGHDR */ + mh.msg_accrights = (char *) fdp; + mh.msg_accrightslen = sizeof (fdp); +@@ -110,7 +110,7 @@ readvfd (int fd, const struct iovec *iov + errno = EAGAIN; + } + if (cmh->cmsg_type == SCM_RIGHTS) { +- *rfdp = (*(int *)CMSG_DATA(cmh)); ++ memcpy(rfdp, CMSG_DATA(cmh), sizeof(int)); + } + } + #else /* !HAVE_CMSGHDR */ |