Skip to contentSkip to conversation

package/netatalk: remove patch applied upstream

PATCH New Bernd Kuhls 3 participants 4 messages Sep 2, 2017

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH 1/2 package/netatalk: remove patch applied upstream

Link to upstream commit:
https://sourceforge.net/p/netatalk/code/ci/d48ecb55ac4c916cd78bbaf4de53a04abf6d47fb/

Fixes
http://autobuild.buildroot.net/results/0a7/0a7c94e074da5a4944f2046cd33fdcc51d3884e5/

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/netatalk/0002-no-acl.patch | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 package/netatalk/0002-no-acl.patch
package/netatalk/0002-no-acl.patch deleted +0 -15
deleted file mode 100644
index 165141b47..000000000
@@ -1,15 +0,0 @@
-Fix builds without acl, from http://sourceforge.net/p/netatalk/bugs/574/
-
-Signed-off-by: Gustavo Zacarias <[email protected]>
-
-diff -Nura netatalk-3.1.7.orig/include/atalk/acl.h netatalk-3.1.7/include/atalk/acl.h
---- netatalk-3.1.7.orig/include/atalk/acl.h	2014-12-03 17:34:49.895524464 -0300
-+++ netatalk-3.1.7/include/atalk/acl.h	2014-12-03 17:34:58.735243283 -0300
-@@ -61,6 +61,7 @@
- #else /* HAVE_ACLS=no */
- 
- #define O_NETATALK_ACL 0
-+#define O_IGNORE 0
- #define chmod_acl chmod
- 
- #endif /* HAVE_ACLS */
Signature · 1 line
2.11.0
author
#1 lore raw

PATCH 2/2 package/netatalk: bump version to 3.1.11

Building 3.1.9 still fails after removing patch 0002:

volume.c:383:26: error: 'ldap_config_valid' undeclared (first use in this function)

                     if (!ldap_config_valid || vol->v_flags & AFPVOL_NONETIDS)

Bumping to 3.1.11 solves the problem.

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/netatalk/netatalk.hash | 6 +++---
 package/netatalk/netatalk.mk   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
package/netatalk/netatalk.hash +3 -3
index 1b974f5b6..ce78373ae 100644
@@ -1,3 +1,3 @@
-# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.9/
-md5	d1d385ae6c3dc45eef4c923472f8fa5f	netatalk-3.1.9.tar.bz2
-sha1	ac746efc00e8cfbe5042a7835b27480bb83505cd	netatalk-3.1.9.tar.bz2
+# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.11/
+md5 8f79ce2a275b128ebb07188766f088fc  netatalk-3.1.11.tar.bz2
+sha1 5aa7900e6f7de3c7ee812aa1130c1245d1974586  netatalk-3.1.11.tar.bz2
package/netatalk/netatalk.mk +1 -1
index e0085db74..28a87509e 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-NETATALK_VERSION = 3.1.9
+NETATALK_VERSION = 3.1.11
 NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION)
 NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2
 # For 0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch
Signature · 1 line
2.11.0
#2 lore raw

PATCH 1/2 package/netatalk: remove patch applied upstream

In reply to Bernd Kuhls

Bernd, All,

On 2017-09-02 19:03 +0200, Bernd Kuhls spake thusly:

Quoted 7 lines

Link to upstream commit:
https://sourceforge.net/p/netatalk/code/ci/d48ecb55ac4c916cd78bbaf4de53a04abf6d47fb/

Fixes
http://autobuild.buildroot.net/results/0a7/0a7c94e074da5a4944f2046cd33fdcc51d3884e5/

Signed-off-by Bernd Kuhls <[email protected]>

Usually, I like that the person that sent a patch that broke the build is in Cc of the fix. That'll teach them! Hehe! ;-)

Acked-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 33 lines
---
 package/netatalk/0002-no-acl.patch | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 package/netatalk/0002-no-acl.patch
package/netatalk/0002-no-acl.patch deleted +0 -15
deleted file mode 100644
index 165141b47..000000000
@@ -1,15 +0,0 @@
-Fix builds without acl, from http://sourceforge.net/p/netatalk/bugs/574/
-
-Signed-off-by: Gustavo Zacarias <[email protected]>
-
-diff -Nura netatalk-3.1.7.orig/include/atalk/acl.h netatalk-3.1.7/include/atalk/acl.h
---- netatalk-3.1.7.orig/include/atalk/acl.h	2014-12-03 17:34:49.895524464 -0300
-+++ netatalk-3.1.7/include/atalk/acl.h	2014-12-03 17:34:58.735243283 -0300
-@@ -61,6 +61,7 @@
- #else /* HAVE_ACLS=no */
- 
- #define O_NETATALK_ACL 0
-+#define O_IGNORE 0
- #define chmod_acl chmod
- 
- #endif /* HAVE_ACLS */
Signature · 6 lines
2.11.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#3 lore raw

PATCH 1/2 package/netatalk: remove patch applied upstream

In reply to Bernd Kuhls

Hello,

Quoted 11 lines · Bernd Kuhls

Link to upstream commit:
https://sourceforge.net/p/netatalk/code/ci/d48ecb55ac4c916cd78bbaf4de53a04abf6d47fb/

Fixes
http://autobuild.buildroot.net/results/0a7/0a7c94e074da5a4944f2046cd33fdcc51d3884e5/

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/netatalk/0002-no-acl.patch | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 package/netatalk/0002-no-acl.patch

Both applied to master. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com