From e5efb329ce6ed3a3435470f9d6c1e8beb118c041 Mon Sep 17 00:00:00 2001 From: Daniel Gryniewicz Date: Wed, 13 Dec 2006 23:00:58 +0000 Subject: [PATCH] Fix gnome-keyring build on freebsd. Bug #157926 Package-Manager: portage-2.1.2_rc2-r5 --- gnome-base/gnome-keyring/ChangeLog | 6 +++- gnome-base/gnome-keyring/Manifest | 28 ++++++++++------- .../files/gnome-keyring-0.6.0-fbsd.patch | 31 +++++++++++++++++++ .../gnome-keyring/gnome-keyring-0.6.0.ebuild | 10 ++++-- 4 files changed, 60 insertions(+), 15 deletions(-) create mode 100644 gnome-base/gnome-keyring/files/gnome-keyring-0.6.0-fbsd.patch diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog index e7d00e7f0898..0bad9e77f31f 100644 --- a/gnome-base/gnome-keyring/ChangeLog +++ b/gnome-base/gnome-keyring/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-base/gnome-keyring # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.79 2006/12/12 16:28:25 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.80 2006/12/13 23:00:58 dang Exp $ + + 13 Dec 2006; Daniel Gryniewicz + +files/gnome-keyring-0.6.0-fbsd.patch, gnome-keyring-0.6.0.ebuild: + Fix gnome-keyring build on freebsd. Bug #157926 12 Dec 2006; Chris Gianelloni gnome-keyring-0.6.0.ebuild: diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest index 32b68f7922b7..a2e1097fb943 100644 --- a/gnome-base/gnome-keyring/Manifest +++ b/gnome-base/gnome-keyring/Manifest @@ -1,20 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX gnome-keyring-0.6.0-fbsd.patch 1268 RMD160 55a9f7eef3f95e59ee5235587b9c32b4681e85c6 SHA1 5ddd51a7929d52c408fc415e3824bf8b776deec3 SHA256 b20766b51197376bb22eae4a03aea84226e4b4147ea9297ab6cd3e2a3ab19acd +MD5 87200f5a1af8eb556a5271a1113e8b7f files/gnome-keyring-0.6.0-fbsd.patch 1268 +RMD160 55a9f7eef3f95e59ee5235587b9c32b4681e85c6 files/gnome-keyring-0.6.0-fbsd.patch 1268 +SHA256 b20766b51197376bb22eae4a03aea84226e4b4147ea9297ab6cd3e2a3ab19acd files/gnome-keyring-0.6.0-fbsd.patch 1268 DIST gnome-keyring-0.4.9.tar.bz2 396162 RMD160 9deca60a67cba29b978974007c59e6963fec900e SHA1 56a9f2b634fd0f1b9bd73bab3824d02a77ad34c3 SHA256 6e287d88c3a4ce8c64bb6b0de151c210ecb20e487d5e1c757ef0ad941a37d393 DIST gnome-keyring-0.6.0.tar.bz2 476280 RMD160 9114a0457871b7a4f9cfe6b3e979ab11881c9145 SHA1 53c5df57c068f3904a296e37ca743666eb42c7bb SHA256 649f2a0d5298b896781d0ac563b8ea1be7f3fe07fd17ea43b0ec0562be47769f EBUILD gnome-keyring-0.4.9.ebuild 580 RMD160 c4ecfafbd51801ee1ca177df3b507cb91f710750 SHA1 221aa480306c5b138810b8616681b17029845447 SHA256 f1ae9ca78d0979f9b580220ddaf0b1fbc7c3467d76133cb55f5afb7781200cf3 MD5 25774ec7cb25c4b9d2f26f298f789739 gnome-keyring-0.4.9.ebuild 580 RMD160 c4ecfafbd51801ee1ca177df3b507cb91f710750 gnome-keyring-0.4.9.ebuild 580 SHA256 f1ae9ca78d0979f9b580220ddaf0b1fbc7c3467d76133cb55f5afb7781200cf3 gnome-keyring-0.4.9.ebuild 580 -EBUILD gnome-keyring-0.6.0.ebuild 611 RMD160 da7a4e5c0e3c20d5ae9eadeabf55391d253c106d SHA1 f1323971dd74efd86af5c4b59e7170455e496215 SHA256 9d4a3c1e50a26ace50602c5aa0f550f3679e056878ae4b26963982aba76f6a00 -MD5 c3344f7845f3e656b23dca31c2925acf gnome-keyring-0.6.0.ebuild 611 -RMD160 da7a4e5c0e3c20d5ae9eadeabf55391d253c106d gnome-keyring-0.6.0.ebuild 611 -SHA256 9d4a3c1e50a26ace50602c5aa0f550f3679e056878ae4b26963982aba76f6a00 gnome-keyring-0.6.0.ebuild 611 -MISC ChangeLog 9207 RMD160 d962ff48af7d9221bea390f569a7fd3a803b8529 SHA1 669cee43d6879b7fbd08c32cc0b2ab69f18b93bf SHA256 e865e1d82b6b3e73e140a87a470f36126bc76aaea54ddc4bf270aa4a73256992 -MD5 720b405c416defe095b8f16422fc88be ChangeLog 9207 -RMD160 d962ff48af7d9221bea390f569a7fd3a803b8529 ChangeLog 9207 -SHA256 e865e1d82b6b3e73e140a87a470f36126bc76aaea54ddc4bf270aa4a73256992 ChangeLog 9207 +EBUILD gnome-keyring-0.6.0.ebuild 690 RMD160 a19077f048db7eaa0852fe2fcff556334ec063d4 SHA1 95471fbc883454bbc12e162a7647903605394efd SHA256 bfc0c02e9da87dd4afd08d41132976dd364e1922c0454be010de5cb90b93a16f +MD5 a30ae679e04bfeb74fcca60259199b3f gnome-keyring-0.6.0.ebuild 690 +RMD160 a19077f048db7eaa0852fe2fcff556334ec063d4 gnome-keyring-0.6.0.ebuild 690 +SHA256 bfc0c02e9da87dd4afd08d41132976dd364e1922c0454be010de5cb90b93a16f gnome-keyring-0.6.0.ebuild 690 +MISC ChangeLog 9375 RMD160 2d8584af8b7fb9ac8a1383ac7ca791c803890a91 SHA1 5a24ac1bf7517e8e0854aff3a1c1f713452992f1 SHA256 e62b0a17531a1fff663ce875da287a543f0a521ddca1e7af271a2d87a41345b4 +MD5 447008d1a32b663b5d26074911896a7d ChangeLog 9375 +RMD160 2d8584af8b7fb9ac8a1383ac7ca791c803890a91 ChangeLog 9375 +SHA256 e62b0a17531a1fff663ce875da287a543f0a521ddca1e7af271a2d87a41345b4 ChangeLog 9375 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158 @@ -26,9 +30,9 @@ MD5 a17d4b56a798af5d9bfe7c22390c1070 files/digest-gnome-keyring-0.6.0 262 RMD160 81e7945248fe55910a1d5dcd25ac8587a8991b24 files/digest-gnome-keyring-0.6.0 262 SHA256 c05189f869ad876daad2f33c9ed9126db57a822c79f897fba786b758e6889e75 files/digest-gnome-keyring-0.6.0 262 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux) -iD8DBQFFftiwkT4lNIS36YERAqfqAJwMRfPefo5GvVwXqkPT98SsE7wsFQCfWGGx -G9X6xn/H+ykF1AMjO8Z+HHI= -=tYbI +iD8DBQFFgIYlomPajV0RnrERAimsAJ9cILOgGvwTjOvW33RuJDy76ZNAowCfV74t +0Jd2szSb5NkiPd/cLOLXflU= +=OoGw -----END PGP SIGNATURE----- diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-0.6.0-fbsd.patch b/gnome-base/gnome-keyring/files/gnome-keyring-0.6.0-fbsd.patch new file mode 100644 index 000000000000..7f0acffdab2b --- /dev/null +++ b/gnome-base/gnome-keyring/files/gnome-keyring-0.6.0-fbsd.patch @@ -0,0 +1,31 @@ +diff --exclude-from=/home/dang/.diffrc -up -ruN gnome-keyring-0.6.0.orig/gnome-keyring.c gnome-keyring-0.6.0/gnome-keyring.c +--- gnome-keyring-0.6.0.orig/gnome-keyring.c 2006-08-28 06:04:36.000000000 -0400 ++++ gnome-keyring-0.6.0/gnome-keyring.c 2006-12-13 17:49:57.000000000 -0500 +@@ -275,9 +275,9 @@ write_credentials_byte_sync (int socket) + msg.msg_control = (caddr_t) &cmsg; + msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred)); + memset (&cmsg, 0, sizeof (cmsg)); +- cmsg->cmsg_len = CMSG_LEN (sizeof (struct cmsgcred)); +- cmsg->cmsg_level = SOL_SOCKET; +- cmsg->cmsg_type = SCM_CREDS; ++ cmsg.hdr.cmsg_len = CMSG_LEN (sizeof (struct cmsgcred)); ++ cmsg.hdr.cmsg_level = SOL_SOCKET; ++ cmsg.hdr.cmsg_type = SCM_CREDS; + #endif + + again: +@@ -324,10 +324,10 @@ write_credentials_byte (GnomeKeyringOper + + msg.msg_control = (caddr_t) &cmsg; + msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred)); +- memset (cmsg, 0, sizeof (cmsg)); +- cmsg->cmsg_len = CMSG_LEN (sizeof (struct cmsgcred)); +- cmsg->cmsg_level = SOL_SOCKET; +- cmsg->cmsg_type = SCM_CREDS; ++ memset (&cmsg, 0, sizeof (cmsg)); ++ cmsg.hdr.cmsg_len = CMSG_LEN (sizeof (struct cmsgcred)); ++ cmsg.hdr.cmsg_level = SOL_SOCKET; ++ cmsg.hdr.cmsg_type = SCM_CREDS; + #endif + + again: diff --git a/gnome-base/gnome-keyring/gnome-keyring-0.6.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-0.6.0.ebuild index fa4de608e8bd..65edb9d1f134 100644 --- a/gnome-base/gnome-keyring/gnome-keyring-0.6.0.ebuild +++ b/gnome-base/gnome-keyring/gnome-keyring-0.6.0.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-0.6.0.ebuild,v 1.5 2006/12/12 16:28:25 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-0.6.0.ebuild,v 1.6 2006/12/13 23:00:58 dang Exp $ -inherit gnome2 +inherit gnome2 eutils DESCRIPTION="Password and keyring managing daemon" HOMEPAGE="http://www.gnome.org/" @@ -19,3 +19,9 @@ DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.9" DOCS="AUTHORS ChangeLog NEWS README TODO" + +src_unpack() { + gnome2_src_unpack + + epatch "${FILESDIR}/${P}-fbsd.patch" +} -- 2.26.2