Skip to contentSkip to conversation

libpcap and libtirpc PUs

PATCH Superseded Cristian Iorga 2 participants 4 messages Dec 16, 2013

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover libpcap and libtirpc PUs

The following changes since commit 9daa1de753e58b7f678e68cf307f6028c0c79a6a:

qemu/local.conf.sample: Add sdl PACKAGECONFIG (2013-12-16 12:13:59 +0000)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib ciorga/PUs
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ciorga/PUs

Cristian Iorga (2):
libtirpc: upgrade to 0.2.4
libpcap: upgrade to 1.5.2

 meta/recipes-connectivity/libpcap/libpcap/aclocal.patch   |  8 ++++----
 .../libpcap/{libpcap_1.4.0.bb => libpcap_1.5.2.bb}        |  4 ++--
 .../libtirpc-0.2.3/obsolete_automake_macros.patch         | 15 ---------------
 .../libtirpc-0.2.1-fortify.patch                          |  0
 .../remove-des-uclibc.patch                               |  0
 .../libtirpc/{libtirpc_0.2.3.bb => libtirpc_0.2.4.bb}     |  8 +++++---
 6 files changed, 11 insertions(+), 24 deletions(-)
 rename meta/recipes-connectivity/libpcap/{libpcap_1.4.0.bb => libpcap_1.5.2.bb} (80%)
 delete mode 100644 meta/recipes-extended/libtirpc/libtirpc-0.2.3/obsolete_automake_macros.patch
 rename meta/recipes-extended/libtirpc/{libtirpc-0.2.3 => libtirpc-0.2.4}/libtirpc-0.2.1-fortify.patch (100%)
 rename meta/recipes-extended/libtirpc/{libtirpc-0.2.3 => libtirpc-0.2.4}/remove-des-uclibc.patch (100%)
 rename meta/recipes-extended/libtirpc/{libtirpc_0.2.3.bb => libtirpc_0.2.4.bb} (84%)
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH 1/2 libtirpc: upgrade to 0.2.4

obsolete_automake_macros.patch removed,
no longer needed.

---
 .../libtirpc-0.2.3/obsolete_automake_macros.patch         | 15 ---------------
 .../libtirpc-0.2.1-fortify.patch                          |  0
 .../remove-des-uclibc.patch                               |  0
 .../libtirpc/{libtirpc_0.2.3.bb => libtirpc_0.2.4.bb}     |  8 +++++---
 4 files changed, 5 insertions(+), 18 deletions(-)
 delete mode 100644 meta/recipes-extended/libtirpc/libtirpc-0.2.3/obsolete_automake_macros.patch
 rename meta/recipes-extended/libtirpc/{libtirpc-0.2.3 => libtirpc-0.2.4}/libtirpc-0.2.1-fortify.patch (100%)
 rename meta/recipes-extended/libtirpc/{libtirpc-0.2.3 => libtirpc-0.2.4}/remove-des-uclibc.patch (100%)
 rename meta/recipes-extended/libtirpc/{libtirpc_0.2.3.bb => libtirpc_0.2.4.bb} (84%)
meta/recipes-extended/libtirpc/libtirpc-0.2.3/obsolete_automake_macros.patch deleted +0 -15
deleted file mode 100644
index 88d759f..0000000
@@ -1,15 +0,0 @@
-Upstream-Status: Submitted [[email protected]]
-
-Signed-off-by: Marko Lindqvist <[email protected]>
-diff -Nurd libtirpc-0.2.2/configure.ac libtirpc-0.2.2/configure.ac
---- libtirpc-0.2.2/configure.ac	2011-05-02 15:10:40.000000000 +0300
-+++ libtirpc-0.2.2/configure.ac	2013-01-11 15:11:24.275000030 +0200
-@@ -17,7 +17,7 @@
- fi
-
- AC_PROG_CC
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AC_PROG_LIBTOOL
- AC_HEADER_DIRENT
- AC_PREFIX_DEFAULT(/usr)
meta/recipes-extended/libtirpc/libtirpc-0.2.4/libtirpc-0.2.1-fortify.patch renamed from meta/recipes-extended/libtirpc/libtirpc-0.2.3/libtirpc-0.2.1-fortify.patch +0 -0
similarity index 100%
rename from meta/recipes-extended/libtirpc/libtirpc-0.2.3/libtirpc-0.2.1-fortify.patch
rename to meta/recipes-extended/libtirpc/libtirpc-0.2.4/libtirpc-0.2.1-fortify.patch
meta/recipes-extended/libtirpc/libtirpc-0.2.4/remove-des-uclibc.patch renamed from meta/recipes-extended/libtirpc/libtirpc-0.2.3/remove-des-uclibc.patch +0 -0
similarity index 100%
rename from meta/recipes-extended/libtirpc/libtirpc-0.2.3/remove-des-uclibc.patch
rename to meta/recipes-extended/libtirpc/libtirpc-0.2.4/remove-des-uclibc.patch
meta/recipes-extended/libtirpc/libtirpc_0.2.4.bb renamed from meta/recipes-extended/libtirpc/libtirpc_0.2.3.bb +5 -3
similarity index 84%
rename from meta/recipes-extended/libtirpc/libtirpc_0.2.3.bb
rename to meta/recipes-extended/libtirpc/libtirpc_0.2.4.bb
index 407e38e..88e2d82 100644
@@ -13,17 +13,19 @@ PROVIDES = "virtual/librpc"
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2;name=libtirpc \
            ${GENTOO_MIRROR}/${BPN}-glibc-nfs.tar.xz;name=glibc-nfs \
            file://libtirpc-0.2.1-fortify.patch \
-           file://obsolete_automake_macros.patch \
           "
 
 SRC_URI_append_libc-uclibc = " file://remove-des-uclibc.patch"
 
-SRC_URI[libtirpc.md5sum] = "b70e6c12a369a91e69fcc3b9feb23d61"
-SRC_URI[libtirpc.sha256sum] = "4f29ea0491b4ca4c29f95f3c34191b857757873bbbf4b069f9dd4da01a6a923c"
+SRC_URI[libtirpc.md5sum] = "847995e8d002cbf1387bda05947be086"
+SRC_URI[libtirpc.sha256sum] = "45c3e21dfc23a5ba501f9dfc6671678316fdfdb8355a1ec404ae2aa2f81943a1"
 SRC_URI[glibc-nfs.md5sum] = "5ae500b9d0b6b72cb875bc04944b9445"
 SRC_URI[glibc-nfs.sha256sum] = "2677cfedf626f3f5a8f6e507aed5bb8f79a7453b589d684dbbc086e755170d83"
+
 inherit autotools pkgconfig
 
+EXTRA_OECONF = "--disable-gssapi"
+
 do_configure_prepend () {
         cp -r ${S}/../tirpc ${S}
 }
Signature · 1 line
1.8.3.2
#2 lore raw

Re: [PATCH 1/2] libtirpc: upgrade to 0.2.4

Quoted 10 lines · Cristian Iorga

obsolete_automake_macros.patch removed,
no longer needed.

---
  .../libtirpc-0.2.3/obsolete_automake_macros.patch         | 15 ---------------
  .../libtirpc-0.2.1-fortify.patch                          |  0
  .../remove-des-uclibc.patch                               |  0
  .../libtirpc/{libtirpc_0.2.3.bb => libtirpc_0.2.4.bb}     |  8 +++++---
  4 files changed, 5 insertions(+), 18 deletions(-)
Quoted 3 lines

delete mode 100644 meta/recipes-extended/libtirpc/libtirpc-0.2.3/obsolete_automake_macros.patch rename meta/recipes-extended/libtirpc/{libtirpc-0.2.3 => libtirpc-0.2.4}/libtirpc-0.2.1-fortify.patch (100%) rename meta/recipes-extended/libtirpc/{libtirpc-0.2.3 => libtirpc-0.2.4}/remove-des-uclibc.patch (100%)

Please rename these to the generic recipe name "libtirpc" if these are not version specific patches.

Quoted 48 lines

rename meta/recipes-extended/libtirpc/{libtirpc_0.2.3.bb => libtirpc_0.2.4.bb} (84%)

meta/recipes-extended/libtirpc/libtirpc-0.2.3/obsolete_automake_macros.patch deleted +0 -15
deleted file mode 100644
index 88d759f..0000000
@@ -1,15 +0,0 @@
-Upstream-Status: Submitted [[email protected]]
-
-Signed-off-by: Marko Lindqvist <[email protected]>
-diff -Nurd libtirpc-0.2.2/configure.ac libtirpc-0.2.2/configure.ac
---- libtirpc-0.2.2/configure.ac	2011-05-02 15:10:40.000000000 +0300
-+++ libtirpc-0.2.2/configure.ac	2013-01-11 15:11:24.275000030 +0200
-@@ -17,7 +17,7 @@
- fi
-
- AC_PROG_CC
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AC_PROG_LIBTOOL
- AC_HEADER_DIRENT
- AC_PREFIX_DEFAULT(/usr)
meta/recipes-extended/libtirpc/libtirpc-0.2.4/libtirpc-0.2.1-fortify.patch renamed from meta/recipes-extended/libtirpc/libtirpc-0.2.3/libtirpc-0.2.1-fortify.patch +0 -0
similarity index 100%
rename from meta/recipes-extended/libtirpc/libtirpc-0.2.3/libtirpc-0.2.1-fortify.patch
rename to meta/recipes-extended/libtirpc/libtirpc-0.2.4/libtirpc-0.2.1-fortify.patch
meta/recipes-extended/libtirpc/libtirpc-0.2.4/remove-des-uclibc.patch renamed from meta/recipes-extended/libtirpc/libtirpc-0.2.3/remove-des-uclibc.patch +0 -0
similarity index 100%
rename from meta/recipes-extended/libtirpc/libtirpc-0.2.3/remove-des-uclibc.patch
rename to meta/recipes-extended/libtirpc/libtirpc-0.2.4/remove-des-uclibc.patch
meta/recipes-extended/libtirpc/libtirpc_0.2.4.bb renamed from meta/recipes-extended/libtirpc/libtirpc_0.2.3.bb +0 -2
similarity index 84%
rename from meta/recipes-extended/libtirpc/libtirpc_0.2.3.bb
rename to meta/recipes-extended/libtirpc/libtirpc_0.2.4.bb
index 407e38e..88e2d82 100644
@@ -13,17 +13,19 @@ PROVIDES = "virtual/librpc"
  SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2;name=libtirpc \
             ${GENTOO_MIRROR}/${BPN}-glibc-nfs.tar.xz;name=glibc-nfs \
             file://libtirpc-0.2.1-fortify.patch \
-           file://obsolete_automake_macros.patch \
            "
 
  SRC_URI_append_libc-uclibc = " file://remove-des-uclibc.patch"
 
-SRC_URI[libtirpc.md5sum] = "b70e6c12a369a91e69fcc3b9feb23d61"

meta/recipes-extended/libtirpc/libtirpc_0.2.4.bb PROVIDES = "virtual/librpc" · line 28

Quoted 10 lines
meta/recipes-extended/libtirpc/libtirpc_0.2.4.bb renamed from meta/recipes-extended/libtirpc/libtirpc_0.2.3.bb +5 -1
-SRC_URI[libtirpc.sha256sum] = "4f29ea0491b4ca4c29f95f3c34191b857757873bbbf4b069f9dd4da01a6a923c"
+SRC_URI[libtirpc.md5sum] = "847995e8d002cbf1387bda05947be086"
+SRC_URI[libtirpc.sha256sum] = "45c3e21dfc23a5ba501f9dfc6671678316fdfdb8355a1ec404ae2aa2f81943a1"
  SRC_URI[glibc-nfs.md5sum] = "5ae500b9d0b6b72cb875bc04944b9445"
  SRC_URI[glibc-nfs.sha256sum] = "2677cfedf626f3f5a8f6e507aed5bb8f79a7453b589d684dbbc086e755170d83"
+
  inherit autotools pkgconfig
 
+EXTRA_OECONF = "--disable-gssapi"
+

You don't say why you added this in the commit message.

Thanks
Sau!

Quoted 4 lines
meta/recipes-extended/libtirpc/libtirpc_0.2.4.bb renamed from meta/recipes-extended/libtirpc/libtirpc_0.2.3.bb +0 -0
  do_configure_prepend () {
          cp -r ${S}/../tirpc ${S}
  }
#3 lore raw

PATCH 2/2 libpcap: upgrade to 1.5.2

In reply to Cristian Iorga

aclocal.patch was updated, still needed.

---
 meta/recipes-connectivity/libpcap/libpcap/aclocal.patch           | 8 ++++----
 .../libpcap/{libpcap_1.4.0.bb => libpcap_1.5.2.bb}                | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename meta/recipes-connectivity/libpcap/{libpcap_1.4.0.bb => libpcap_1.5.2.bb} (80%)
meta/recipes-connectivity/libpcap/libpcap/aclocal.patch +4 -4
index 469d122..2151982 100644
@@ -9,16 +9,16 @@ diff -ruN libpcap-1.1.1-orig/aclocal.m4 libpcap-1.1.1/aclocal.m4
  dnl
 -AC_DEFUN(AC_LBL_C_INIT_BEFORE_CC,
 +AC_DEFUN([AC_LBL_C_INIT_BEFORE_CC],
-     [AC_PREREQ(2.50)
+ [
      AC_BEFORE([$0], [AC_LBL_C_INIT])
      AC_BEFORE([$0], [AC_PROG_CC])
 @@ -90,7 +90,7 @@
- dnl	ac_cv_lbl_gcc_vers
- dnl	LBL_CFLAGS
+ dnl     LDFLAGS
+ dnl     LBL_CFLAGS
  dnl
 -AC_DEFUN(AC_LBL_C_INIT,
 +AC_DEFUN([AC_LBL_C_INIT],
-     [AC_PREREQ(2.50)
+ [
      AC_BEFORE([$0], [AC_LBL_FIXINCLUDES])
      AC_BEFORE([$0], [AC_LBL_DEVEL])
 @@ -217,7 +217,7 @@
meta/recipes-connectivity/libpcap/libpcap_1.5.2.bb renamed from meta/recipes-connectivity/libpcap/libpcap_1.4.0.bb +2 -2
similarity index 80%
rename from meta/recipes-connectivity/libpcap/libpcap_1.4.0.bb
rename to meta/recipes-connectivity/libpcap/libpcap_1.5.2.bb
index 75a540e..37cc141 100644
@@ -6,8 +6,8 @@ SRC_URI += "file://aclocal.patch \
             file://ieee80215-arphrd.patch \
            "
 
-SRC_URI[md5sum] = "56e88a5aabdd1e04414985ac24f7e76c"
-SRC_URI[sha256sum] = "7c6a2a4f71e8ab09804e6b4fb3aff998c5583108ac42c0e2967eee8e1dbc7406"
+SRC_URI[md5sum] = "33ba2f10f3a402cb5d34f5e2a904794a"
+SRC_URI[sha256sum] = "806d4ba23b126476d39a458ad1468f73dfe63c92f9586208f7e4e18c13e52ddd"
 
 #
 # make install doesn't cover the shared lib
Signature · 1 line
1.8.3.2