Browse Source

openssh: Just link sshd to libtermux-auth

android-5
Fredrik Fornwall 6 years ago
parent
commit
9e0ce53765
  1. 12
      packages/openssh/Makefile.in.patch
  2. 1
      packages/openssh/build.sh

12
packages/openssh/Makefile.in.patch

@ -0,0 +1,12 @@
diff -u -r ../openssh-7.9p1/Makefile.in ./Makefile.in
--- ../openssh-7.9p1/Makefile.in 2018-10-17 00:01:20.000000000 +0000
+++ ./Makefile.in 2018-11-22 23:35:57.866748335 +0000
@@ -172,7 +172,7 @@
$(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHLIBS) $(LIBS) $(GSSLIBS)
sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS)
- $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS) $(GSSLIBS) $(K5LIBS)
+ $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -ltermux-auth -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS) $(GSSLIBS) $(K5LIBS)
scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o
$(LD) -o $@ scp.o progressmeter.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)

1
packages/openssh/build.sh

@ -51,7 +51,6 @@ termux_step_pre_configure() {
CPPFLAGS+=" -DHAVE_ATTRIBUTE__SENTINEL__=1 -DBROKEN_SETRESGID" CPPFLAGS+=" -DHAVE_ATTRIBUTE__SENTINEL__=1 -DBROKEN_SETRESGID"
LD=$CC # Needed to link the binaries LD=$CC # Needed to link the binaries
LDFLAGS+=" -llog" # liblog for android logging in syslog hack LDFLAGS+=" -llog" # liblog for android logging in syslog hack
LDFLAGS+=" -ltermux-auth" # libtermux-auth for password auth
} }
termux_step_post_configure() { termux_step_post_configure() {

Loading…
Cancel
Save