From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 02 Jan 2023 09:43:56 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pCGQG-00GldH-IH for lore@lore.pengutronix.de; Mon, 02 Jan 2023 09:43:56 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1pCGQF-0006Ov-99; Mon, 02 Jan 2023 09:43:55 +0100 Received: from mail-vi1eur03on2049.outbound.protection.outlook.com ([40.107.103.49] helo=EUR03-VI1-obe.outbound.protection.outlook.com) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pCGQ5-0006OQ-8P for ptxdist@pengutronix.de; Mon, 02 Jan 2023 09:43:45 +0100 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G6J5KBIAjLTMzVh2LpKeK98iE7R0XJt7m9j9g6Mq9EDIAdtWQ3VzAZUkAugZ2pClUbP91UE+liG1iuH6nGqhRTincO8Gm2x2F2YnBm6Fwdc4n6xGgejgGgNF/ADyji0i6C3QxeMjfb8ksO6UW+bdfvAEDifoDUi6aEyuU0yAsk6/Xwdd8qpLqgbE1PYW/reaFlUKClOsQDRvUYTFOyBqu1sZ1tMhWXvnJgdJNecfz15SkD/cR7AO2fRMIQIVdMUSQbt55UPhHJ2eh+1qXiP/GR/G7n9yOcik7I4S50RvCKvOkm78UwWpJAn7xwct8RaqbOyT9BaFPU3pkTCooVNb/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=U4dXlNOAVymuRKCnn/DQERCsAnMMh/+p+nmyJY3JLrk=; b=oafM8MZD3pyrYQ3d2kiSouRbqK3WJlb8oQJ2Iqd1nWT+TdGGDfvRtRexwpR+o8Nxr36nCgfOUj1nV4I2sVG8nheaN5EcNR7OIgesLwt1tYUnepVNdbzc+p9c3v/W36Ifs2IHM1LlX0X4ZMB+7jOqZ4/QqNmezGrydIbTLHgNJ208bFfvdxAXZI4o20JD3G3IiknCFccRaabDeZoEpBH11HgFWHh5L6xtI9WqQ1kdjqJtc9+a0DDjajlBSY4BkqJQSSSojY3O77FsIEKVQKQ4SQYQHLW8XFWQt2lW4fZjHIMRoKMVkIsNRTZcZhMQrFxWdJbG7X74m6PHtmzr0FzqPw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=t2data.com; dmarc=pass action=none header.from=t2data.com; dkim=pass header.d=t2data.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=t2datacom.onmicrosoft.com; s=selector1-t2datacom-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=U4dXlNOAVymuRKCnn/DQERCsAnMMh/+p+nmyJY3JLrk=; b=KeeUGqLLbqfFY3xuf0XV80T5sIn9TnJ9XxOVGWnPL3jtkdgX3Eohf+lS7FnnAO1V7Zjs19XcNBAYa4NmBSN0WGQwPkWFnBwnRe5HZp4dmMrFerFnrJYUasybnAyiR/YQyo9EtKQ4PsJsVTYYU0At79ozpD+5IpnuIEZMnlgDMgM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=t2data.com; Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) by AS4P251MB0709.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:4c0::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.19; Mon, 2 Jan 2023 08:43:43 +0000 Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::d8cf:bdbe:3526:aa50]) by DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::d8cf:bdbe:3526:aa50%5]) with mapi id 15.20.5944.019; Mon, 2 Jan 2023 08:43:43 +0000 From: Christian Melki To: ptxdist@pengutronix.de Date: Mon, 2 Jan 2023 09:43:21 +0100 Message-Id: <20230102084321.1853175-1-christian.melki@t2data.com> X-Mailer: git-send-email 2.34.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: GV3PEPF000000D0.SWEP280.PROD.OUTLOOK.COM (2603:10a6:144:1:0:2:0:15) To DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9P251MB0618:EE_|AS4P251MB0709:EE_ X-MS-Office365-Filtering-Correlation-Id: d7a37f4d-e909-46b4-5f15-08daec9d7434 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lebIKZShPVedrVCmrAgN4iqxUF37E1ySM+Ywn8edPenVQhpWAeRKVwA3R1Qmcaq4Ur8UxUAeYcQ6LkMClZwsLQxwcrNxtdD8gH+r9l9r11AjWkt+SVMA3OlACoOrew9ANfKvRXkZtoZpuMqeUDhGdELP5CZBjUJj7Z+3Y7/7o1A9e5DOHbKW+6tN6PkgRWBRzK5D2zg+1+gI7jz7JMFJDu3q9u1kEuyorUpE6/xnJzrMuy25T9TCDIsg998BGrZaaVM5Nj8LWJ8KRhIhNvhu/axSUtl8u9Z7557+J2tqoqhaD1r6QrsEZ0C9UPYm+1r68TN4OwhA+o/DhB9KyD30Ko67lhkfoUrEmzd+nfsfHXt/cp68lo1wEhnVM2I7Mx2X2Arnm+a3EduUdvogKW2g8MZlGSUi+YMrZG7QPqMTywdxD+H3IzidU9zIBr5mrGX7pCdAutIMTNuFcvWWnh7D7E2cRexz3cfjLrzOi5oLekAEU2k0o8/e/EPalrXRs0a26hauO96ndgfp+nUKIOWs2C27peddT/V1EuLopainE1oiIh2AnhzbS9bcKVfMx+hHbdx7KxSw0I2FcWRaXOqEkEkfSzu07g0ywG5KwDFw+AY3vAA85TcpGNja/4Kx6TcYlCwWkzDDcOjhYreFP85ZeAhpJv0i5s7fuKPuNTNUsrvkiU9x/3JGVp7jltW9iI3STL2CD8jtpqIWRcxV7sonPBYAxNG9BhWYa2hAe38bHrhoXkyu6Vf5NqO1W5szHPv2 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9P251MB0618.EURP251.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230022)(396003)(366004)(376002)(136003)(39830400003)(346002)(451199015)(38100700002)(38350700002)(36756003)(86362001)(6506007)(6916009)(316002)(1076003)(66946007)(66476007)(2616005)(6486002)(66556008)(478600001)(6512007)(966005)(26005)(186003)(52116002)(6666004)(2906002)(41300700001)(8676002)(8936002)(44832011)(83380400001)(5660300002)(22166006); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?fIRtkhEqRxQozBAeSD1xnLsY8Brapz+vIFYK8EM7aki4vf02GOQ+8u+ZqFKC?= =?us-ascii?Q?wiagTmDLR/NCupq1WxGlPFgRhNZqSCJdSZOp1BFUYifcgJkt4ufGb3ZEWuDL?= =?us-ascii?Q?+2xrhyce3f9WSKBTb4k4ZhlH7InBqKDS3zr+QbFbjWA3ByLbSVhoqR3PvZoy?= =?us-ascii?Q?5mxidE8x4qlF2LWSXACS40gnvgv/vn9J1zQItM2yN3SOT0ydxviehnA/i+Ul?= =?us-ascii?Q?6bJd2WsVM5skbfWLZr6ww1Kr8Wqj5LxWoD5TcGvIYONHXCrwy42nn2viV1bO?= =?us-ascii?Q?GawxCIHqv+8IYpdFYiay0/Hsf34pRsftyl56b0Dzl+OB+VX7k1JbxKLEX81v?= =?us-ascii?Q?WqssTzaKHQSW41GhyrRES8P0pHvIglIWVxtuLvXAF0Xfun587g3L2R4MjUdI?= =?us-ascii?Q?JleqwRd+Sn6HqWTkX+7XYuqUP1ZNC6Tz3LmgwWOCS43BGuW1bsxC4g59fN8W?= =?us-ascii?Q?Qpv2inLiAkH6JkMF8CihE18qdgSceqaOrXT2nxcMTjIB6bBzGqH8SRooz9ww?= =?us-ascii?Q?QTzwDom9t52exA8hkp5K8PEASMIy66lMKVcZqIcRuNJcXZhZjS+gzqloGBDX?= =?us-ascii?Q?0R2zHEPtold4nrN0meMaSa7fNO4ST3qjOxmZ0GJTre9eYxNmfAB+XRY+8aPv?= =?us-ascii?Q?Mh2Av3NO21Ls330fBKleYwoxdINUrXJfEx/IkBW1S5f6y2NKEZrL1HMXglGR?= =?us-ascii?Q?BjZRf9Y1sLx9lnNWcUgyGFoYIqOGFrsMz+/AFe0z/5XiFGbEmB6DiriPniy3?= =?us-ascii?Q?PXkIlXlTFOPRpEX1hLCt4D4VeOTySqLoQXv1bBs7rjTEkDUyWRPBA0PetVw8?= =?us-ascii?Q?A40O7t0ukHwvlLQzbuvPvJXaYixm7QOWtzLq3myz6M++iuv2waM1qHr8a8Sb?= =?us-ascii?Q?AQtvHYLe7KnvK/f9zWNicyetZHWC2vhUB5Ro3AzrRfjUD6LJgweOvl9pqu+1?= =?us-ascii?Q?yZF4VeXXFqwi3LDioYeyyR4tHPLC86mOz8BswvhddCF36bOtjgVtbKmqQbNH?= =?us-ascii?Q?1G0PCCJ32+oW+8fN2RZkjOtHAudViAW1VPLVwI4NG1h8bBB9cpe5YxBpTQ6U?= =?us-ascii?Q?sB1+7wSqvfhVooGirzOigiuVIT7ElF5RsQvec01LX5LZme7xDxU6wwjyz1QX?= =?us-ascii?Q?ZtJOv2ajADvwiKzgBbva6Ay6qokqzqnBm1o9/wNRJTWlvg5uTXus/5cRSo6L?= =?us-ascii?Q?RZk9/F5ysE/Yn+a353h7gPZe1C8boEvqDgm3w/jHFctkw2jspT4JuBzWSKir?= =?us-ascii?Q?otNdbiVYGXUUj+4HbjLZG62eiZCGerJQ9VssobfkhYuLkTnlotkQtOdhnQHd?= =?us-ascii?Q?AVb/hQrPfJEuTT7m37b1u7eitsyGFi1R3k3dX0DXIuRc7Wxmfg4CqPN/XW1L?= =?us-ascii?Q?BEIDrFdQbDP9qrypCPAyWjgvOR0lFvWp2VwWkAWsRDSv1CwrZj479yYJzE0W?= =?us-ascii?Q?N9wUTdy9Ivhy5p/qb70ojiFcsYbnbMY8zmdShz+hxxTqfH1kjiI5Ya4OZttF?= =?us-ascii?Q?vqCOePmXOA1uTSc3NmePaGf1HqB24Zo9JURxdvAkpYBTHFmzIzaz8l5EV9W7?= =?us-ascii?Q?M5cxyXV3+OczvSDCOktVnSyjThbeXk4k3OXaLAKeK6zqbWZmcfJnJ/nZvOlV?= =?us-ascii?Q?CA=3D=3D?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: d7a37f4d-e909-46b4-5f15-08daec9d7434 X-MS-Exchange-CrossTenant-AuthSource: DB9P251MB0618.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jan 2023 08:43:43.0893 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 27928da5-aacd-4ba1-9566-c748a6863e6c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: rtmcsemd1jZ8ldJXutKCMnxOVIWpUbBnXxdGB+LzLcj0bYQD/+jokOQfsfIObgDVax0aJNtduw/pG3JZFhIPtUMflZ5whyZjklDQq/b7vs8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4P251MB0709 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH] libpcap: Version bump. 1.10.1 -> 1.10.2 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false A bunch of fixes. https://github.com/the-tcpdump-group/libpcap/blob/0ec30c896aceed38db0dfc0144ffc09669769855/CHANGES#L42 * Reworked patch for just installing the shared library file. * Reworked $SYSROOT for pcap-config patch. I don't think pcap-config is needed though. libpcap got .pc back in 2018 something. So this is mostly for builds that don't use that (or before 2018). I'll leave this up to the maintainer to remove. Signed-off-by: Christian Melki --- ...100-build-and-install-share-lib-only.patch | 10 +++++----- ...0101-pcap-config-add-SYSROOT-support.patch | 19 +++++-------------- .../{libpcap-1.10.1 => libpcap-1.10.2}/series | 0 rules/libpcap.make | 4 ++-- 4 files changed, 12 insertions(+), 21 deletions(-) rename patches/{libpcap-1.10.1 => libpcap-1.10.2}/0100-build-and-install-share-lib-only.patch (79%) rename patches/{libpcap-1.10.1 => libpcap-1.10.2}/0101-pcap-config-add-SYSROOT-support.patch (54%) rename patches/{libpcap-1.10.1 => libpcap-1.10.2}/series (100%) diff --git a/patches/libpcap-1.10.1/0100-build-and-install-share-lib-only.patch b/patches/libpcap-1.10.2/0100-build-and-install-share-lib-only.patch similarity index 79% rename from patches/libpcap-1.10.1/0100-build-and-install-share-lib-only.patch rename to patches/libpcap-1.10.2/0100-build-and-install-share-lib-only.patch index dda3366ae..c909f70b1 100644 --- a/patches/libpcap-1.10.1/0100-build-and-install-share-lib-only.patch +++ b/patches/libpcap-1.10.2/0100-build-and-install-share-lib-only.patch @@ -12,19 +12,19 @@ Signed-off-by: Alexander Aring 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 5d88ea713174..2cbcab1a0907 100644 +index 787b18a06a93..dd7870c0475b 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -415,7 +415,7 @@ EXTRA_DIST = \ - Win32/Prj/wpcap.vcxproj \ - Win32/Prj/wpcap.vcxproj.filters +@@ -429,7 +429,7 @@ RELEASE_FILES = $(COMMON_C_SRC) $(HDR) $(MAN1) $(MAN3PCAP_EXPAND) \ + $(MAN3PCAP_NOEXPAND) $(MANFILE) $(MANMISC) $(EXTRA_DIST) \ + $(TEST_DIST) -all: libpcap.a shared $(BUILD_RPCAPD) libpcap.pc pcap-config +all: shared $(BUILD_RPCAPD) libpcap.pc pcap-config libpcap.a: $(OBJ) @rm -f $@ -@@ -601,7 +601,7 @@ testprogs: FORCE +@@ -615,7 +615,7 @@ testprogs: FORCE FORCE: diff --git a/patches/libpcap-1.10.1/0101-pcap-config-add-SYSROOT-support.patch b/patches/libpcap-1.10.2/0101-pcap-config-add-SYSROOT-support.patch similarity index 54% rename from patches/libpcap-1.10.1/0101-pcap-config-add-SYSROOT-support.patch rename to patches/libpcap-1.10.2/0101-pcap-config-add-SYSROOT-support.patch index b51c27faa..9cb27d0af 100644 --- a/patches/libpcap-1.10.1/0101-pcap-config-add-SYSROOT-support.patch +++ b/patches/libpcap-1.10.2/0101-pcap-config-add-SYSROOT-support.patch @@ -4,11 +4,11 @@ Subject: [PATCH] pcap-config: add SYSROOT support Signed-off-by: Alexander Aring --- - pcap-config.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + pcap-config.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pcap-config.in b/pcap-config.in -index 54ca42f07bc5..23b06c300577 100644 +index afa8919d8a50..f9b8b1512892 100644 --- a/pcap-config.in +++ b/pcap-config.in @@ -10,8 +10,8 @@ @@ -19,15 +19,6 @@ index 54ca42f07bc5..23b06c300577 100644 -libdir="@libdir@" +includedir="${SYSROOT}@includedir@" +libdir="${SYSROOT}@libdir@" - V_RPATH_OPT="@V_RPATH_OPT@" LIBS="@LIBS@" - PACKAGE_NAME="@PACKAGE_NAME@" -@@ -46,7 +46,7 @@ then - # - # If libdir isn't /usr/lib, add it to the run-time linker path. - # -- if [ "$libdir" != "/usr/lib" ] -+ if [ "$libdir" != "${SYSROOT}/usr/lib" ] - then - RPATH=$V_RPATH_OPT$libdir - fi + LIBS_STATIC="@LIBS_STATIC@" + diff --git a/patches/libpcap-1.10.1/series b/patches/libpcap-1.10.2/series similarity index 100% rename from patches/libpcap-1.10.1/series rename to patches/libpcap-1.10.2/series diff --git a/rules/libpcap.make b/rules/libpcap.make index 1d51449ae..9f07d452a 100644 --- a/rules/libpcap.make +++ b/rules/libpcap.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBPCAP) += libpcap # # Paths and names # -LIBPCAP_VERSION := 1.10.1 -LIBPCAP_MD5 := 28e17495004036567c2cc884b51eba45 +LIBPCAP_VERSION := 1.10.2 +LIBPCAP_MD5 := 9f27d8e5595fb14e6bc8151ef6f5610b LIBPCAP := libpcap-$(LIBPCAP_VERSION) LIBPCAP_SUFFIX := tar.gz LIBPCAP_URL := http://www.tcpdump.org/release/$(LIBPCAP).$(LIBPCAP_SUFFIX) -- 2.34.1