* [meta-networking][PATCH 0/2] two more Netkit packages
@ 2014-11-28 5:34 Armin Kuster
2014-11-28 5:34 ` [meta-networking][PATCH 1/2] New package: netkit-rsh Armin Kuster
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Armin Kuster @ 2014-11-28 5:34 UTC (permalink / raw)
To: openembedded-devel
Please consider these two packages for inclusion to meta-networking.
I have placed them in their own recipes location for others from the family to be added later.
Armin Kuster (2):
New package: netkit-rsh
New package: Netkit-ftp
.../netkit-ftp/files/Add_ARG_MAX_define.patch | 28 ++++++++++
.../recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb | 46 ++++++++++++++++
.../files/rsh-redone_link_order_file.patch | 64 ++++++++++++++++++++++
.../recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb | 61 +++++++++++++++++++++
4 files changed, 199 insertions(+)
create mode 100644 meta-networking/recipes-netkit/netkit-ftp/files/Add_ARG_MAX_define.patch
create mode 100644 meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb
create mode 100644 meta-networking/recipes-netkit/netkit-rsh/files/rsh-redone_link_order_file.patch
create mode 100644 meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb
--
1.9.1
^ permalink raw reply [flat|nested] 7+ messages in thread
* [meta-networking][PATCH 1/2] New package: netkit-rsh
2014-11-28 5:34 [meta-networking][PATCH 0/2] two more Netkit packages Armin Kuster
@ 2014-11-28 5:34 ` Armin Kuster
2014-12-03 17:49 ` Martin Jansa
2014-11-28 5:34 ` [meta-networking][PATCH 2/2] New package: Netkit-ftp Armin Kuster
2014-12-01 3:48 ` [meta-networking][PATCH 0/2] two more Netkit packages Joe MacDonald
2 siblings, 1 reply; 7+ messages in thread
From: Armin Kuster @ 2014-11-28 5:34 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../files/rsh-redone_link_order_file.patch | 64 ++++++++++++++++++++++
.../recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb | 61 +++++++++++++++++++++
2 files changed, 125 insertions(+)
create mode 100644 meta-networking/recipes-netkit/netkit-rsh/files/rsh-redone_link_order_file.patch
create mode 100644 meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb
diff --git a/meta-networking/recipes-netkit/netkit-rsh/files/rsh-redone_link_order_file.patch b/meta-networking/recipes-netkit/netkit-rsh/files/rsh-redone_link_order_file.patch
new file mode 100644
index 0000000..bded510
--- /dev/null
+++ b/meta-networking/recipes-netkit/netkit-rsh/files/rsh-redone_link_order_file.patch
@@ -0,0 +1,64 @@
+This fixes a build issue caused by linking order.
+
+Upstream-Status: Inappropriate
+Most distos have there own verison of this fix. This was derived by
+* Fix link order to list libraries after the objects that require them
+(LP: #771080).
+
+-- Colin Watson <cjwatson@ubuntu.com> Tue, 13 Sep 2011 10:07:08 +0100
+
+
+signed-off-by: Armin Kuster <akuster808@gmail.com>
+
+Index: netkit-rsh-0.17/rsh/Makefile
+===================================================================
+--- netkit-rsh-0.17.orig/rsh/Makefile
++++ netkit-rsh-0.17/rsh/Makefile
+@@ -6,7 +6,7 @@ include ../MRULES
+ OBJS = rsh.o
+
+ rsh: $(OBJS)
+- $(CC) $(LDFLAGS) $^ $(LIBS) -o $@
++ $(CC) $^ -o $@ $(LDFLAGS) $(LIBS)
+
+ install: rsh
+ install -o root -m$(SUIDMODE) rsh $(INSTALLROOT)$(BINDIR)
+Index: netkit-rsh-0.17/rshd/Makefile
+===================================================================
+--- netkit-rsh-0.17.orig/rshd/Makefile
++++ netkit-rsh-0.17/rshd/Makefile
+@@ -11,7 +11,7 @@ LIBS += -ldl -lpam
+ endif
+
+ rshd: $(OBJS)
+- $(CC) $(LDFLAGS) $^ $(LIBS) -o $@
++ $(CC) $^ -o $@ $(LDFLAGS) $(LIBS)
+
+ install: rshd
+ install -m$(DAEMONMODE) rshd $(INSTALLROOT)$(SBINDIR)/in.rshd
+Index: netkit-rsh-0.17/rlogin/Makefile
+===================================================================
+--- netkit-rsh-0.17.orig/rlogin/Makefile
++++ netkit-rsh-0.17/rlogin/Makefile
+@@ -7,7 +7,7 @@ PROG=rlogin
+ OBJS=rlogin.o
+
+ $(PROG): $(OBJS)
+- $(CC) $(LDFLAGS) $^ $(LIBS) -o $@
++ $(CC) $^ -o $@ $(LDFLAGS) $(LIBS)
+
+ install: $(PROG)
+ install -o root -m$(SUIDMODE) $(PROG) $(INSTALLROOT)$(BINDIR)
+Index: netkit-rsh-0.17/rlogind/Makefile
+===================================================================
+--- netkit-rsh-0.17.orig/rlogind/Makefile
++++ netkit-rsh-0.17/rlogind/Makefile
+@@ -13,7 +13,7 @@ LIBS += -ldl -lpam -lpam_misc
+ endif
+
+ rlogind: $(OBJS)
+- $(CC) $(LDFLAGS) $^ $(LIBS) -o $@
++ $(CC) $^ -o $@ $(LDFLAGS) $(LIBS)
+
+ rlogind.o: pathnames.h logwtmp.h rlogind.h ../version.h
+ logwtmp.o: logwtmp.h
diff --git a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb
new file mode 100644
index 0000000..6874950
--- /dev/null
+++ b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb
@@ -0,0 +1,61 @@
+DESCRIPTION = "netkit-rsh includes the rsh daemon and client."
+SECTION = "networking"
+HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit"
+LICENSE = "BSD"
+DEPENDS = "libpam libgcrypt"
+
+LIC_FILES_CHKSUM = "file://rsh/rsh.c;beginline=2;endline=3;md5=25737e9d21d9df251dd26b7dcbd8ee29"
+
+SRC_URI = "${DEBIAN_MIRROR}/main/n/netkit-rsh/netkit-rsh_${PV}.orig.tar.gz;name=archive \
+ ${DEBIAN_MIRROR}/main/n/netkit-rsh/netkit-rsh_${PV}-15.diff.gz;name=patch15 \
+ file://rsh-redone_link_order_file.patch \
+"
+
+SRC_URI[archive.md5sum] = "65f5f28e2fe22d9ad8b17bb9a10df096"
+SRC_URI[archive.sha256sum] = "edcac7fa18015f0bc04e573f3f54ae3b638d71335df1ad7dae692779914ad669"
+SRC_URI[patch15.md5sum] = "655efc0d541b03ca5de0ae506c805ea3"
+SRC_URI[patch15.sha256sum] = "2bc071c438e8b0ed42a0bd2db2d8b681b27a1e9b1798694d9874733293bc2aa9"
+
+inherit distro_features_check
+
+CFLAGS += " -D_GNU_SOURCE -Wno-deprecated-declarations"
+LDFLAGS += " -lutil"
+
+do_configure () {
+ ./configure --prefix=${prefix}
+ echo "USE_PAM=1" >> MCONFIG
+ echo "LDFLAGS=${LDFLAGS}" >> MCONFIG
+
+ # didn't want to patch these next changes
+ sed -i 's/netkit-//' ${S}/rsh/pathnames.h
+ sed -i 's/netkit-//' ${S}/rcp/pathnames.h
+}
+
+do_install () {
+ install -d ${D}${bindir}
+ install -d ${D}${sbindir}
+ install -d ${D}${mandir}/man1
+ install -d ${D}${mandir}/man8
+ install -d ${D}${sysconfdir}/pam.d
+
+ oe_runmake 'INSTALLROOT=${D}' 'BINMODE=0755' \
+ 'DAEMONMODE=0755' 'MANMODE=0644' \
+ 'SUIDMODE=4755' \
+ 'BINDIR=${bindir}' 'SBINDIR=${sbindir}' \
+ 'MANDIR=${mandir}' install
+
+ install -m 0644 debian/hosts.equiv ${D}/${sysconfdir}
+ install -m 0644 debian/pam.d/rexec ${D}/${sysconfdir}/pam.d
+ install -m 0644 debian/pam.d/rlogin ${D}/${sysconfdir}/pam.d
+ install -m 0644 debian/pam.d/rsh ${D}/${sysconfdir}/pam.d
+}
+
+PACKAGES = "${PN}-client ${PN}-server ${PN}-doc ${BPN}-dbg"
+FILES_${PN}-client = "${bindir}/*"
+FILES_${PN}-server = "${sbindir}/* ${sysconfdir}"
+FILES_${PN}-doc = "${mandir}"
+FILES_${PN}-dbg = "${prefix}/src/debug \
+ ${sbindir}/.debug ${bindir}/.debug"
+
+RDEPENDS_${PN} = "libpam"
+REQUIRED_DISTRO_FEATURES ?= "pam"
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [meta-networking][PATCH 2/2] New package: Netkit-ftp
2014-11-28 5:34 [meta-networking][PATCH 0/2] two more Netkit packages Armin Kuster
2014-11-28 5:34 ` [meta-networking][PATCH 1/2] New package: netkit-rsh Armin Kuster
@ 2014-11-28 5:34 ` Armin Kuster
2014-12-01 3:48 ` [meta-networking][PATCH 0/2] two more Netkit packages Joe MacDonald
2 siblings, 0 replies; 7+ messages in thread
From: Armin Kuster @ 2014-11-28 5:34 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../netkit-ftp/files/Add_ARG_MAX_define.patch | 28 +++++++++++++
.../recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb | 46 ++++++++++++++++++++++
2 files changed, 74 insertions(+)
create mode 100644 meta-networking/recipes-netkit/netkit-ftp/files/Add_ARG_MAX_define.patch
create mode 100644 meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb
diff --git a/meta-networking/recipes-netkit/netkit-ftp/files/Add_ARG_MAX_define.patch b/meta-networking/recipes-netkit/netkit-ftp/files/Add_ARG_MAX_define.patch
new file mode 100644
index 0000000..5a47fd9
--- /dev/null
+++ b/meta-networking/recipes-netkit/netkit-ftp/files/Add_ARG_MAX_define.patch
@@ -0,0 +1,28 @@
+This adds ARG_MAX define to be _SC_ARG_MAX
+
+Upstream-Status: Inappropriate.
+Most distros have their own verion for this fix.
+
+Signed-off-by: Armin Kuster <akuster808@gmail.com>
+
+Index: netkit-ftp-0.17/ftp/glob.c
+===================================================================
+--- netkit-ftp-0.17.orig/ftp/glob.c
++++ netkit-ftp-0.17/ftp/glob.c
+@@ -50,6 +50,7 @@ char glob_rcsid[] =
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <unistd.h>
+
+ #include "ftp_var.h" /* for protos only */
+ #include "glob.h"
+@@ -57,6 +58,9 @@ char glob_rcsid[] =
+ #define QUOTE 0200
+ #define TRIM 0177
+ #define eq(a,b) (strcmp(a, b)==0)
++#ifndef ARG_MAX
++#define ARG_MAX (sysconf(_SC_ARG_MAX))
++#endif
+ #define GAVSIZ (ARG_MAX/6)
+ #define isdir(d) ((d.st_mode & S_IFMT) == S_IFDIR)
diff --git a/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb b/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb
new file mode 100644
index 0000000..8bac049
--- /dev/null
+++ b/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb
@@ -0,0 +1,46 @@
+DESCRIPTION = "netkit-ft includes the ftp client."
+SECTION = "networking"
+HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit"
+LICENSE = "BSD"
+
+LIC_FILES_CHKSUM = "file://ftp/ftp.c;beginline=2;endline=3;md5=2d40a75a50d83b8f6317b3f53db72bfa"
+
+SRC_URI = "${DEBIAN_MIRROR}/main/n/netkit-ftp/netkit-ftp_${PV}.orig.tar.gz;name=archive \
+ ${DEBIAN_MIRROR}/main/n/netkit-ftp/netkit-ftp_${PV}-31.debian.tar.xz;name=patch31 \
+ file://Add_ARG_MAX_define.patch \
+"
+
+SRC_URI[archive.md5sum] = "94441610c9b86ef45c4c6ec609444060"
+SRC_URI[archive.sha256sum] = "61c913299b81a4671ff089aac821329f7db9bc111aa812993dd585798b700349"
+SRC_URI[patch31.md5sum] = "93d71e28ce70df69e080c7f90da63cac"
+SRC_URI[patch31.sha256sum] = "4edd46a32d70daa7ba00f0ebf0118dc5d17dff23d6e46aa21a2722be2e22d1c1"
+
+inherit autotools-brokensep
+
+do_configure () {
+ ./configure --prefix=${prefix}
+ echo "LDFLAGS=${LDFLAGS}" >> MCONFIG
+}
+
+BINMODE = "0755"
+MANMODE = "0644"
+
+do_install () {
+ install -d ${D}${bindir}
+ install -d ${D}${mandir}/man1
+ install -d ${D}${mandir}/man5
+
+ install -m${BINMODE} ${S}/ftp/ftp ${D}${bindir}
+ ln -sf ${D}${bindir}/ftp ${D}${bindir}/pftp
+ install -m${MANMODE} ${S}/ftp/ftp.1 ${D}${mandir}/man1
+ ln -sf ftp.1 ${D}${mandir}/man1/pftp.1
+ install -m${MANMODE} ${S}/ftp/netrc.5 ${D}${mandir}/man5
+}
+
+PACKAGES = "${PN} ${PN}-doc ${BPN}-dbg"
+FILES_${PN} = "${bindir}/*"
+FILES_${PN}-doc = "${mandir}"
+FILES_${PN}-dbg = "${prefix}/src/debug \
+ ${bindir}/.debug"
+
+RDEPENDS_${PN} = "readline"
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [meta-networking][PATCH 0/2] two more Netkit packages
2014-11-28 5:34 [meta-networking][PATCH 0/2] two more Netkit packages Armin Kuster
2014-11-28 5:34 ` [meta-networking][PATCH 1/2] New package: netkit-rsh Armin Kuster
2014-11-28 5:34 ` [meta-networking][PATCH 2/2] New package: Netkit-ftp Armin Kuster
@ 2014-12-01 3:48 ` Joe MacDonald
2014-12-01 5:07 ` akuster
2 siblings, 1 reply; 7+ messages in thread
From: Joe MacDonald @ 2014-12-01 3:48 UTC (permalink / raw)
To: Armin Kuster; +Cc: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 1356 bytes --]
Hey Armin,
I merged netkit-ftp. Could you put together a pam-optional version of
netkit-rsh? Or is that going to be a huge pain for you? I'd really
like to provide a version that uses PAM if available rather than
requires it.
-J.
[[meta-networking][PATCH 0/2] two more Netkit packages] On 14.11.27 (Thu 21:34) Armin Kuster wrote:
> Please consider these two packages for inclusion to meta-networking.
> I have placed them in their own recipes location for others from the family to be added later.
>
> Armin Kuster (2):
> New package: netkit-rsh
> New package: Netkit-ftp
>
> .../netkit-ftp/files/Add_ARG_MAX_define.patch | 28 ++++++++++
> .../recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb | 46 ++++++++++++++++
> .../files/rsh-redone_link_order_file.patch | 64 ++++++++++++++++++++++
> .../recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb | 61 +++++++++++++++++++++
> 4 files changed, 199 insertions(+)
> create mode 100644 meta-networking/recipes-netkit/netkit-ftp/files/Add_ARG_MAX_define.patch
> create mode 100644 meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb
> create mode 100644 meta-networking/recipes-netkit/netkit-rsh/files/rsh-redone_link_order_file.patch
> create mode 100644 meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb
>
--
-Joe MacDonald.
:wq
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 501 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [meta-networking][PATCH 0/2] two more Netkit packages
2014-12-01 3:48 ` [meta-networking][PATCH 0/2] two more Netkit packages Joe MacDonald
@ 2014-12-01 5:07 ` akuster
0 siblings, 0 replies; 7+ messages in thread
From: akuster @ 2014-12-01 5:07 UTC (permalink / raw)
To: openembedded-devel, Joe MacDonald
On 11/30/2014 07:48 PM, Joe MacDonald wrote:
> Hey Armin,
>
> I merged netkit-ftp. Could you put together a pam-optional version of
> netkit-rsh? Or is that going to be a huge pain for you?
no pain.
I'd really
> like to provide a version that uses PAM if available rather than
> requires it.
many thanks,
Armin
>
> -J.
>
> [[meta-networking][PATCH 0/2] two more Netkit packages] On 14.11.27 (Thu 21:34) Armin Kuster wrote:
>
>> Please consider these two packages for inclusion to meta-networking.
>> I have placed them in their own recipes location for others from the family to be added later.
>>
>> Armin Kuster (2):
>> New package: netkit-rsh
>> New package: Netkit-ftp
>>
>> .../netkit-ftp/files/Add_ARG_MAX_define.patch | 28 ++++++++++
>> .../recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb | 46 ++++++++++++++++
>> .../files/rsh-redone_link_order_file.patch | 64 ++++++++++++++++++++++
>> .../recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb | 61 +++++++++++++++++++++
>> 4 files changed, 199 insertions(+)
>> create mode 100644 meta-networking/recipes-netkit/netkit-ftp/files/Add_ARG_MAX_define.patch
>> create mode 100644 meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb
>> create mode 100644 meta-networking/recipes-netkit/netkit-rsh/files/rsh-redone_link_order_file.patch
>> create mode 100644 meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb
>>
>>
>>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [meta-networking][PATCH 1/2] New package: netkit-rsh
2014-11-28 5:34 ` [meta-networking][PATCH 1/2] New package: netkit-rsh Armin Kuster
@ 2014-12-03 17:49 ` Martin Jansa
2014-12-03 21:04 ` Joe MacDonald
0 siblings, 1 reply; 7+ messages in thread
From: Martin Jansa @ 2014-12-03 17:49 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 6360 bytes --]
On Thu, Nov 27, 2014 at 09:34:03PM -0800, Armin Kuster wrote:
> Signed-off-by: Armin Kuster <akuster808@gmail.com>
Subject should start with "netkit-rsh: "
Use netkit-rsh instead of files for slightly faster lookup.
This applies to more patches you recently sent, I'll update them this
time when cherry-picking to master-next, but please check that next
time.
> ---
> .../files/rsh-redone_link_order_file.patch | 64 ++++++++++++++++++++++
> .../recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb | 61 +++++++++++++++++++++
> 2 files changed, 125 insertions(+)
> create mode 100644 meta-networking/recipes-netkit/netkit-rsh/files/rsh-redone_link_order_file.patch
> create mode 100644 meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb
>
> diff --git a/meta-networking/recipes-netkit/netkit-rsh/files/rsh-redone_link_order_file.patch b/meta-networking/recipes-netkit/netkit-rsh/files/rsh-redone_link_order_file.patch
> new file mode 100644
> index 0000000..bded510
> --- /dev/null
> +++ b/meta-networking/recipes-netkit/netkit-rsh/files/rsh-redone_link_order_file.patch
> @@ -0,0 +1,64 @@
> +This fixes a build issue caused by linking order.
> +
> +Upstream-Status: Inappropriate
> +Most distos have there own verison of this fix. This was derived by
> +* Fix link order to list libraries after the objects that require them
> +(LP: #771080).
> +
> +-- Colin Watson <cjwatson@ubuntu.com> Tue, 13 Sep 2011 10:07:08 +0100
> +
> +
> +signed-off-by: Armin Kuster <akuster808@gmail.com>
> +
> +Index: netkit-rsh-0.17/rsh/Makefile
> +===================================================================
> +--- netkit-rsh-0.17.orig/rsh/Makefile
> ++++ netkit-rsh-0.17/rsh/Makefile
> +@@ -6,7 +6,7 @@ include ../MRULES
> + OBJS = rsh.o
> +
> + rsh: $(OBJS)
> +- $(CC) $(LDFLAGS) $^ $(LIBS) -o $@
> ++ $(CC) $^ -o $@ $(LDFLAGS) $(LIBS)
> +
> + install: rsh
> + install -o root -m$(SUIDMODE) rsh $(INSTALLROOT)$(BINDIR)
> +Index: netkit-rsh-0.17/rshd/Makefile
> +===================================================================
> +--- netkit-rsh-0.17.orig/rshd/Makefile
> ++++ netkit-rsh-0.17/rshd/Makefile
> +@@ -11,7 +11,7 @@ LIBS += -ldl -lpam
> + endif
> +
> + rshd: $(OBJS)
> +- $(CC) $(LDFLAGS) $^ $(LIBS) -o $@
> ++ $(CC) $^ -o $@ $(LDFLAGS) $(LIBS)
> +
> + install: rshd
> + install -m$(DAEMONMODE) rshd $(INSTALLROOT)$(SBINDIR)/in.rshd
> +Index: netkit-rsh-0.17/rlogin/Makefile
> +===================================================================
> +--- netkit-rsh-0.17.orig/rlogin/Makefile
> ++++ netkit-rsh-0.17/rlogin/Makefile
> +@@ -7,7 +7,7 @@ PROG=rlogin
> + OBJS=rlogin.o
> +
> + $(PROG): $(OBJS)
> +- $(CC) $(LDFLAGS) $^ $(LIBS) -o $@
> ++ $(CC) $^ -o $@ $(LDFLAGS) $(LIBS)
> +
> + install: $(PROG)
> + install -o root -m$(SUIDMODE) $(PROG) $(INSTALLROOT)$(BINDIR)
> +Index: netkit-rsh-0.17/rlogind/Makefile
> +===================================================================
> +--- netkit-rsh-0.17.orig/rlogind/Makefile
> ++++ netkit-rsh-0.17/rlogind/Makefile
> +@@ -13,7 +13,7 @@ LIBS += -ldl -lpam -lpam_misc
> + endif
> +
> + rlogind: $(OBJS)
> +- $(CC) $(LDFLAGS) $^ $(LIBS) -o $@
> ++ $(CC) $^ -o $@ $(LDFLAGS) $(LIBS)
> +
> + rlogind.o: pathnames.h logwtmp.h rlogind.h ../version.h
> + logwtmp.o: logwtmp.h
> diff --git a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb
> new file mode 100644
> index 0000000..6874950
> --- /dev/null
> +++ b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb
> @@ -0,0 +1,61 @@
> +DESCRIPTION = "netkit-rsh includes the rsh daemon and client."
> +SECTION = "networking"
> +HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit"
> +LICENSE = "BSD"
> +DEPENDS = "libpam libgcrypt"
> +
> +LIC_FILES_CHKSUM = "file://rsh/rsh.c;beginline=2;endline=3;md5=25737e9d21d9df251dd26b7dcbd8ee29"
> +
> +SRC_URI = "${DEBIAN_MIRROR}/main/n/netkit-rsh/netkit-rsh_${PV}.orig.tar.gz;name=archive \
> + ${DEBIAN_MIRROR}/main/n/netkit-rsh/netkit-rsh_${PV}-15.diff.gz;name=patch15 \
> + file://rsh-redone_link_order_file.patch \
> +"
> +
> +SRC_URI[archive.md5sum] = "65f5f28e2fe22d9ad8b17bb9a10df096"
> +SRC_URI[archive.sha256sum] = "edcac7fa18015f0bc04e573f3f54ae3b638d71335df1ad7dae692779914ad669"
> +SRC_URI[patch15.md5sum] = "655efc0d541b03ca5de0ae506c805ea3"
> +SRC_URI[patch15.sha256sum] = "2bc071c438e8b0ed42a0bd2db2d8b681b27a1e9b1798694d9874733293bc2aa9"
> +
> +inherit distro_features_check
> +
> +CFLAGS += " -D_GNU_SOURCE -Wno-deprecated-declarations"
> +LDFLAGS += " -lutil"
> +
> +do_configure () {
> + ./configure --prefix=${prefix}
> + echo "USE_PAM=1" >> MCONFIG
> + echo "LDFLAGS=${LDFLAGS}" >> MCONFIG
> +
> + # didn't want to patch these next changes
> + sed -i 's/netkit-//' ${S}/rsh/pathnames.h
> + sed -i 's/netkit-//' ${S}/rcp/pathnames.h
> +}
> +
> +do_install () {
> + install -d ${D}${bindir}
> + install -d ${D}${sbindir}
> + install -d ${D}${mandir}/man1
> + install -d ${D}${mandir}/man8
> + install -d ${D}${sysconfdir}/pam.d
> +
> + oe_runmake 'INSTALLROOT=${D}' 'BINMODE=0755' \
> + 'DAEMONMODE=0755' 'MANMODE=0644' \
> + 'SUIDMODE=4755' \
> + 'BINDIR=${bindir}' 'SBINDIR=${sbindir}' \
> + 'MANDIR=${mandir}' install
> +
> + install -m 0644 debian/hosts.equiv ${D}/${sysconfdir}
> + install -m 0644 debian/pam.d/rexec ${D}/${sysconfdir}/pam.d
> + install -m 0644 debian/pam.d/rlogin ${D}/${sysconfdir}/pam.d
> + install -m 0644 debian/pam.d/rsh ${D}/${sysconfdir}/pam.d
> +}
> +
> +PACKAGES = "${PN}-client ${PN}-server ${PN}-doc ${BPN}-dbg"
> +FILES_${PN}-client = "${bindir}/*"
> +FILES_${PN}-server = "${sbindir}/* ${sysconfdir}"
> +FILES_${PN}-doc = "${mandir}"
> +FILES_${PN}-dbg = "${prefix}/src/debug \
> + ${sbindir}/.debug ${bindir}/.debug"
> +
> +RDEPENDS_${PN} = "libpam"
> +REQUIRED_DISTRO_FEATURES ?= "pam"
> --
> 1.9.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [meta-networking][PATCH 1/2] New package: netkit-rsh
2014-12-03 17:49 ` Martin Jansa
@ 2014-12-03 21:04 ` Joe MacDonald
0 siblings, 0 replies; 7+ messages in thread
From: Joe MacDonald @ 2014-12-03 21:04 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 7163 bytes --]
[Re: [oe] [meta-networking][PATCH 1/2] New package: netkit-rsh] On 14.12.03 (Wed 18:49) Martin Jansa wrote:
> On Thu, Nov 27, 2014 at 09:34:03PM -0800, Armin Kuster wrote:
> > Signed-off-by: Armin Kuster <akuster808@gmail.com>
>
> Subject should start with "netkit-rsh: "
>
> Use netkit-rsh instead of files for slightly faster lookup.
>
> This applies to more patches you recently sent, I'll update them this
> time when cherry-picking to master-next, but please check that next
> time.
I've been working on the current netkit-* queue off-and-on yesterday and
today and done a bit of tweaking on them as well to better match the
appropriate style. Thanks for sending out the reminder, though, I don't
mind doing whitespace cleanup in patches I merge, but it's always nice
if I don't have to. :-)
-J.
>
> > ---
> > .../files/rsh-redone_link_order_file.patch | 64 ++++++++++++++++++++++
> > .../recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb | 61 +++++++++++++++++++++
> > 2 files changed, 125 insertions(+)
> > create mode 100644 meta-networking/recipes-netkit/netkit-rsh/files/rsh-redone_link_order_file.patch
> > create mode 100644 meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb
> >
> > diff --git a/meta-networking/recipes-netkit/netkit-rsh/files/rsh-redone_link_order_file.patch b/meta-networking/recipes-netkit/netkit-rsh/files/rsh-redone_link_order_file.patch
> > new file mode 100644
> > index 0000000..bded510
> > --- /dev/null
> > +++ b/meta-networking/recipes-netkit/netkit-rsh/files/rsh-redone_link_order_file.patch
> > @@ -0,0 +1,64 @@
> > +This fixes a build issue caused by linking order.
> > +
> > +Upstream-Status: Inappropriate
> > +Most distos have there own verison of this fix. This was derived by
> > +* Fix link order to list libraries after the objects that require them
> > +(LP: #771080).
> > +
> > +-- Colin Watson <cjwatson@ubuntu.com> Tue, 13 Sep 2011 10:07:08 +0100
> > +
> > +
> > +signed-off-by: Armin Kuster <akuster808@gmail.com>
> > +
> > +Index: netkit-rsh-0.17/rsh/Makefile
> > +===================================================================
> > +--- netkit-rsh-0.17.orig/rsh/Makefile
> > ++++ netkit-rsh-0.17/rsh/Makefile
> > +@@ -6,7 +6,7 @@ include ../MRULES
> > + OBJS = rsh.o
> > +
> > + rsh: $(OBJS)
> > +- $(CC) $(LDFLAGS) $^ $(LIBS) -o $@
> > ++ $(CC) $^ -o $@ $(LDFLAGS) $(LIBS)
> > +
> > + install: rsh
> > + install -o root -m$(SUIDMODE) rsh $(INSTALLROOT)$(BINDIR)
> > +Index: netkit-rsh-0.17/rshd/Makefile
> > +===================================================================
> > +--- netkit-rsh-0.17.orig/rshd/Makefile
> > ++++ netkit-rsh-0.17/rshd/Makefile
> > +@@ -11,7 +11,7 @@ LIBS += -ldl -lpam
> > + endif
> > +
> > + rshd: $(OBJS)
> > +- $(CC) $(LDFLAGS) $^ $(LIBS) -o $@
> > ++ $(CC) $^ -o $@ $(LDFLAGS) $(LIBS)
> > +
> > + install: rshd
> > + install -m$(DAEMONMODE) rshd $(INSTALLROOT)$(SBINDIR)/in.rshd
> > +Index: netkit-rsh-0.17/rlogin/Makefile
> > +===================================================================
> > +--- netkit-rsh-0.17.orig/rlogin/Makefile
> > ++++ netkit-rsh-0.17/rlogin/Makefile
> > +@@ -7,7 +7,7 @@ PROG=rlogin
> > + OBJS=rlogin.o
> > +
> > + $(PROG): $(OBJS)
> > +- $(CC) $(LDFLAGS) $^ $(LIBS) -o $@
> > ++ $(CC) $^ -o $@ $(LDFLAGS) $(LIBS)
> > +
> > + install: $(PROG)
> > + install -o root -m$(SUIDMODE) $(PROG) $(INSTALLROOT)$(BINDIR)
> > +Index: netkit-rsh-0.17/rlogind/Makefile
> > +===================================================================
> > +--- netkit-rsh-0.17.orig/rlogind/Makefile
> > ++++ netkit-rsh-0.17/rlogind/Makefile
> > +@@ -13,7 +13,7 @@ LIBS += -ldl -lpam -lpam_misc
> > + endif
> > +
> > + rlogind: $(OBJS)
> > +- $(CC) $(LDFLAGS) $^ $(LIBS) -o $@
> > ++ $(CC) $^ -o $@ $(LDFLAGS) $(LIBS)
> > +
> > + rlogind.o: pathnames.h logwtmp.h rlogind.h ../version.h
> > + logwtmp.o: logwtmp.h
> > diff --git a/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb
> > new file mode 100644
> > index 0000000..6874950
> > --- /dev/null
> > +++ b/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb
> > @@ -0,0 +1,61 @@
> > +DESCRIPTION = "netkit-rsh includes the rsh daemon and client."
> > +SECTION = "networking"
> > +HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit"
> > +LICENSE = "BSD"
> > +DEPENDS = "libpam libgcrypt"
> > +
> > +LIC_FILES_CHKSUM = "file://rsh/rsh.c;beginline=2;endline=3;md5=25737e9d21d9df251dd26b7dcbd8ee29"
> > +
> > +SRC_URI = "${DEBIAN_MIRROR}/main/n/netkit-rsh/netkit-rsh_${PV}.orig.tar.gz;name=archive \
> > + ${DEBIAN_MIRROR}/main/n/netkit-rsh/netkit-rsh_${PV}-15.diff.gz;name=patch15 \
> > + file://rsh-redone_link_order_file.patch \
> > +"
> > +
> > +SRC_URI[archive.md5sum] = "65f5f28e2fe22d9ad8b17bb9a10df096"
> > +SRC_URI[archive.sha256sum] = "edcac7fa18015f0bc04e573f3f54ae3b638d71335df1ad7dae692779914ad669"
> > +SRC_URI[patch15.md5sum] = "655efc0d541b03ca5de0ae506c805ea3"
> > +SRC_URI[patch15.sha256sum] = "2bc071c438e8b0ed42a0bd2db2d8b681b27a1e9b1798694d9874733293bc2aa9"
> > +
> > +inherit distro_features_check
> > +
> > +CFLAGS += " -D_GNU_SOURCE -Wno-deprecated-declarations"
> > +LDFLAGS += " -lutil"
> > +
> > +do_configure () {
> > + ./configure --prefix=${prefix}
> > + echo "USE_PAM=1" >> MCONFIG
> > + echo "LDFLAGS=${LDFLAGS}" >> MCONFIG
> > +
> > + # didn't want to patch these next changes
> > + sed -i 's/netkit-//' ${S}/rsh/pathnames.h
> > + sed -i 's/netkit-//' ${S}/rcp/pathnames.h
> > +}
> > +
> > +do_install () {
> > + install -d ${D}${bindir}
> > + install -d ${D}${sbindir}
> > + install -d ${D}${mandir}/man1
> > + install -d ${D}${mandir}/man8
> > + install -d ${D}${sysconfdir}/pam.d
> > +
> > + oe_runmake 'INSTALLROOT=${D}' 'BINMODE=0755' \
> > + 'DAEMONMODE=0755' 'MANMODE=0644' \
> > + 'SUIDMODE=4755' \
> > + 'BINDIR=${bindir}' 'SBINDIR=${sbindir}' \
> > + 'MANDIR=${mandir}' install
> > +
> > + install -m 0644 debian/hosts.equiv ${D}/${sysconfdir}
> > + install -m 0644 debian/pam.d/rexec ${D}/${sysconfdir}/pam.d
> > + install -m 0644 debian/pam.d/rlogin ${D}/${sysconfdir}/pam.d
> > + install -m 0644 debian/pam.d/rsh ${D}/${sysconfdir}/pam.d
> > +}
> > +
> > +PACKAGES = "${PN}-client ${PN}-server ${PN}-doc ${BPN}-dbg"
> > +FILES_${PN}-client = "${bindir}/*"
> > +FILES_${PN}-server = "${sbindir}/* ${sysconfdir}"
> > +FILES_${PN}-doc = "${mandir}"
> > +FILES_${PN}-dbg = "${prefix}/src/debug \
> > + ${sbindir}/.debug ${bindir}/.debug"
> > +
> > +RDEPENDS_${PN} = "libpam"
> > +REQUIRED_DISTRO_FEATURES ?= "pam"
> > --
> > 1.9.1
> >
> > --
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
> --
> Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
--
-Joe MacDonald.
:wq
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 501 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-12-03 21:04 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-28 5:34 [meta-networking][PATCH 0/2] two more Netkit packages Armin Kuster
2014-11-28 5:34 ` [meta-networking][PATCH 1/2] New package: netkit-rsh Armin Kuster
2014-12-03 17:49 ` Martin Jansa
2014-12-03 21:04 ` Joe MacDonald
2014-11-28 5:34 ` [meta-networking][PATCH 2/2] New package: Netkit-ftp Armin Kuster
2014-12-01 3:48 ` [meta-networking][PATCH 0/2] two more Netkit packages Joe MacDonald
2014-12-01 5:07 ` akuster
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.