Skip to content

Commit

Permalink
Issue #902: Remove the bundled libcap library, and rely only on the
Browse files Browse the repository at this point in the history
system libcap libraries.
  • Loading branch information
Castaglia committed Feb 18, 2020
1 parent ea951ae commit 8c84570
Show file tree
Hide file tree
Showing 14 changed files with 5 additions and 1,555 deletions.
8 changes: 0 additions & 8 deletions configure
Expand Up @@ -42229,9 +42229,6 @@ for module in $ac_static_modules; do

test x"$addonlibs" = x || ac_addl_libs="$addonlibs $ac_addl_libs"

adir=`cat $srcdir/modules/$src | grep "\\\$Directories:" | sed -e 's/^.*\$Directories: \(.*\)\\$/\1/'`
test x"$adir" = x || ac_addl_dirs="$adir $ac_addl_dirs"

elif test -d $srcdir/modules/$moduledir -o -d $srcdir/contrib/$moduledir; then
continue

Expand All @@ -42242,11 +42239,6 @@ echo "$as_me: error: source file '$srcdir/modules/$src' cannot be found -- abort
fi
done

if test x"$ac_have_libcap" = xyes; then
ac_addl_libs=`echo "$ac_addl_libs" | sed -e 's/-L\$(top_srcdir)\/lib\/libcap//g'`
ac_addl_dirs=`echo "$ac_addl_dirs" | sed -e 's/\$(top_srcdir)\/lib\/libcap//g'`
fi

ac_addl_libs=`echo "$ac_addl_libs" | sed -e 's/ *\$//'`
ac_addl_libs=`echo "$ac_addl_libs" | sed -e 's/^ *//'`
test "x$ac_addl_libs" = x || ac_build_addl_libs="$ac_build_addl_libs $ac_addl_libs"
Expand Down
13 changes: 1 addition & 12 deletions configure.in
@@ -1,7 +1,7 @@
dnl ProFTPD - FTP server daemon
dnl Copyright (c) 1997, 1998 Public Flood Software
dnl Copyright (c) 1999, 2000 MacGyver aka Habeeb J. Dihu <macgyver@tos.net>
dnl Copyright (c) 2001-2019 The ProFTPD Project team
dnl Copyright (c) 2001-2020 The ProFTPD Project team
dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -3892,9 +3892,6 @@ for module in $ac_static_modules; do

test x"$addonlibs" = x || ac_addl_libs="$addonlibs $ac_addl_libs"

adir=`cat $srcdir/modules/$src | grep "\\\$Directories:" | sed -e 's/^.*\$Directories: \(.*\)\\$/\1/'`
test x"$adir" = x || ac_addl_dirs="$adir $ac_addl_dirs"

elif test -d $srcdir/modules/$moduledir -o -d $srcdir/contrib/$moduledir; then
continue

Expand All @@ -3903,14 +3900,6 @@ for module in $ac_static_modules; do
fi
done

dnl This is a nasty, cap-specific hack. If we will be using the system
dnl libcap (i.e. ac_have_libcap is "yes"), then we want to remove the
dnl hackish stuff that mod_cap added to the library and directory strings.
if test x"$ac_have_libcap" = xyes; then
ac_addl_libs=`echo "$ac_addl_libs" | sed -e 's/-L\$(top_srcdir)\/lib\/libcap//g'`
ac_addl_dirs=`echo "$ac_addl_dirs" | sed -e 's/\$(top_srcdir)\/lib\/libcap//g'`
fi

ac_addl_libs=`echo "$ac_addl_libs" | sed -e 's/ *\$//'`
ac_addl_libs=`echo "$ac_addl_libs" | sed -e 's/^ *//'`
test "x$ac_addl_libs" = x || ac_build_addl_libs="$ac_build_addl_libs $ac_addl_libs"
Expand Down
58 changes: 0 additions & 58 deletions lib/libcap/Makefile

This file was deleted.

94 changes: 0 additions & 94 deletions lib/libcap/_makenames.c

This file was deleted.

156 changes: 0 additions & 156 deletions lib/libcap/cap_alloc.c

This file was deleted.

0 comments on commit 8c84570

Please sign in to comment.