summaryrefslogtreecommitdiff
path: root/net-fs/netatalk
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-04-12 03:41:30 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-04-12 03:41:30 +0100
commit623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree993eb27c93ec7a2d2d19550300d888fc1fed9e69 /net-fs/netatalk
parentceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'net-fs/netatalk')
-rw-r--r--net-fs/netatalk/Manifest3
-rw-r--r--net-fs/netatalk/files/netatalk-3.1.12-my_bool.patch16
-rw-r--r--net-fs/netatalk/netatalk-3.1.12.ebuild1
3 files changed, 19 insertions, 1 deletions
diff --git a/net-fs/netatalk/Manifest b/net-fs/netatalk/Manifest
index 51d062fd6f97..aca62d1078bd 100644
--- a/net-fs/netatalk/Manifest
+++ b/net-fs/netatalk/Manifest
@@ -1,5 +1,6 @@
+AUX netatalk-3.1.12-my_bool.patch 664 BLAKE2B f3eb18c0f73eea3b2caba305e052ce1705f40c1542ae14f0e3160e353b1da6b7c94be03285277b58888f01ed309ef62e7ee9736b5d7bd717d33123feb0aee107 SHA512 c09298f83b6e9d650c08dac410478122f203c38d7e10918b52456da828c34643ba0e2dba359d872d76d167217ce9dcf5a697761743452e482b87da5c7b3b1c0b
AUX netatalk-3.1.7-gentoo.patch 4910 BLAKE2B cfff6844b53dfbae3336739df3e89baede2c9ed88566f0c3831d0a1e25e1c0aff8bbb5e09a36fd2b59b2ed7dc3fd0c9a3a68f80d65717f59538071cf1395c98e SHA512 5b8ff4ba306e1467d089df9c3f9dcfb22c4c21cce2c6b53e29dc84006efda0b88609cd00a01a2eec8f153d85d3c7283a1b5123219ecce1fe120a143290f3958f
AUX netatalk-3.1.8-disable-ld-library-path.patch 1860 BLAKE2B 0c5c8671754c2868236c7b0603ad738b4ba5443f7fa61b9f32052103de33a611bdc628210785b9aee5feaaeea4fee969bc77ac90e494a7cfc72c10f567ee3f22 SHA512 971e1d4787f94e3f608dd7de4ea8721d3027aacc5b6461fbee0332d7434704336a35c2962d54c4b380bb3cf76c56d9cd6e8bf094f9bd9a0958054bf83e25299b
DIST netatalk-3.1.12.tar.bz2 1918312 BLAKE2B a0672ad769530d96b13a4bf74a1f17d86aa924f05e8185cf6b1bdbfe97fbcf23d36e2f3e5e32a32194a9d3020864e5afa2812f8fb947c68629b15c259a745bf3 SHA512 0b22abaf0084d5684ccc049225abb34caa32893ea8fe7eb67901fde94726f054149ce78d2da49cf06fe30360eb18b2edccff20f9ac69d5ab5105f6d2f4178759
-EBUILD netatalk-3.1.12.ebuild 4839 BLAKE2B 246ec82ac0eaa9ee615061c49e5d59dc97808885730148d60b0ee86ccd72ae14d589bec3cbb1c0115028c57a319e6d227ed076d9459ed5d4a81568b66887d911 SHA512 0b59904affcdc9951a4745d9c7670c2555e896227c34d2cfdd7b8c208f609e49d536eb306137235d9b9e38fccc6d368c71ae93908127cd3e588f7beb094d8838
+EBUILD netatalk-3.1.12.ebuild 4889 BLAKE2B 5ae3fef080a291e1161d3e8e404d5925ca3f4eea5ddaa524582ea1e01765f75da3ee3193496bc38051e6bf3ebd8ed3b6743dcaa8c360c38e50bc6538a45e8207 SHA512 3afcf785df73515347c07a94a966e9feb51c3e3ddd68e2a4cadfb88f675c613076e3cd983558ee005850b175fe53ffa1dd06df678c0b4fd98cd96f48f99e3508
MISC metadata.xml 771 BLAKE2B a78f49af27765d075dc38234d4f0dd5c10e560b9ba10e17d6e24ed379b445f4db7e3148ecba449139e316c977ec43b606b7a83bf3075c7c53c3a8e81359f6033 SHA512 28ee7eb659776c18de5da3cb593e17f504b9eee22f429e41ad4cc1f7fcb64c953f67b2aed63cf43c5f05991bc3b4a37b1e768342213a13b7e866588c47d4f460
diff --git a/net-fs/netatalk/files/netatalk-3.1.12-my_bool.patch b/net-fs/netatalk/files/netatalk-3.1.12-my_bool.patch
new file mode 100644
index 000000000000..3b4ff99ec577
--- /dev/null
+++ b/net-fs/netatalk/files/netatalk-3.1.12-my_bool.patch
@@ -0,0 +1,16 @@
+fix my_bool compilation issue due to newer MySQL removing the type
+
+https://bugs.gentoo.org/692560
+Patch by Kostiantyn Gorbunov
+
+--- a/libatalk/cnid/mysql/cnid_mysql.c 2016-03-10 10:06:20.000000000 +0200
++++ b/libatalk/cnid/mysql/cnid_mysql.c 2019-09-02 19:55:04.361132422 +0300
+@@ -848,7 +848,7 @@
+
+ /* Initialize and connect to MySQL server */
+ EC_NULL( db->cnid_mysql_con = mysql_init(NULL) );
+- my_bool my_recon = true;
++ bool my_recon = true;
+ EC_ZERO( mysql_options(db->cnid_mysql_con, MYSQL_OPT_RECONNECT, &my_recon) );
+ int my_timeout = 600;
+ EC_ZERO( mysql_options(db->cnid_mysql_con, MYSQL_OPT_CONNECT_TIMEOUT, &my_timeout) );
diff --git a/net-fs/netatalk/netatalk-3.1.12.ebuild b/net-fs/netatalk/netatalk-3.1.12.ebuild
index da4f8e1ca7cd..369ce4e2ac3b 100644
--- a/net-fs/netatalk/netatalk-3.1.12.ebuild
+++ b/net-fs/netatalk/netatalk-3.1.12.ebuild
@@ -59,6 +59,7 @@ REQUIRED_USE="
PATCHES=(
"${FILESDIR}"/${PN}-3.1.7-gentoo.patch
"${FILESDIR}"/${PN}-3.1.8-disable-ld-library-path.patch #564350
+ "${FILESDIR}"/${PN}-3.1.12-my_bool.patch #692560
)
src_prepare() {