diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/squid/ipkg | |
parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/squid/ipkg')
13 files changed, 0 insertions, 62 deletions
diff --git a/package/squid/ipkg/squid-mod-basic-auth-getpwnam.control b/package/squid/ipkg/squid-mod-basic-auth-getpwnam.control deleted file mode 100644 index cc9dfe661..000000000 --- a/package/squid/ipkg/squid-mod-basic-auth-getpwnam.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: squid-mod-basic-auth-getpwnam -Section: net -Depends: squid -Priority: optional -Description: getpwnam basic authentication helper diff --git a/package/squid/ipkg/squid-mod-basic-auth-ncsa.control b/package/squid/ipkg/squid-mod-basic-auth-ncsa.control deleted file mode 100644 index 94b8e9ece..000000000 --- a/package/squid/ipkg/squid-mod-basic-auth-ncsa.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: squid-mod-basic-auth-ncsa -Section: net -Depends: squid -Priority: optional -Description: ncsa basic authentication helper diff --git a/package/squid/ipkg/squid-mod-basic-auth-smb.control b/package/squid/ipkg/squid-mod-basic-auth-smb.control deleted file mode 100644 index 9adbeaa01..000000000 --- a/package/squid/ipkg/squid-mod-basic-auth-smb.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: squid-mod-basic-auth-smb -Section: net -Depends: squid -Priority: optional -Description: Samba basic authentication helper diff --git a/package/squid/ipkg/squid-mod-basic-auth-winbind.control b/package/squid/ipkg/squid-mod-basic-auth-winbind.control deleted file mode 100644 index 49047fab5..000000000 --- a/package/squid/ipkg/squid-mod-basic-auth-winbind.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: squid-mod-basic-auth-winbind -Section: net -Depends: squid -Priority: optional -Description: winbind basic authentication helper diff --git a/package/squid/ipkg/squid-mod-digest-auth-password.control b/package/squid/ipkg/squid-mod-digest-auth-password.control deleted file mode 100644 index a78b61636..000000000 --- a/package/squid/ipkg/squid-mod-digest-auth-password.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: squid-mod-digest-auth-password -Section: net -Depends: squid -Priority: optional -Description: password digest authentication helper diff --git a/package/squid/ipkg/squid-mod-external-acl-ip-user.control b/package/squid/ipkg/squid-mod-external-acl-ip-user.control deleted file mode 100644 index eb613a370..000000000 --- a/package/squid/ipkg/squid-mod-external-acl-ip-user.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: squid-mod-external-acl-ip-user -Section: net -Depends: squid -Priority: optional -Description: IP user external acl helper diff --git a/package/squid/ipkg/squid-mod-external-acl-unix-group.control b/package/squid/ipkg/squid-mod-external-acl-unix-group.control deleted file mode 100644 index 01614125f..000000000 --- a/package/squid/ipkg/squid-mod-external-acl-unix-group.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: squid-mod-external-acl-unix-group -Section: net -Depends: squid -Priority: optional -Description: Unix group external acl helper diff --git a/package/squid/ipkg/squid-mod-external-acl-winbind-group.control b/package/squid/ipkg/squid-mod-external-acl-winbind-group.control deleted file mode 100644 index 308a32d46..000000000 --- a/package/squid/ipkg/squid-mod-external-acl-winbind-group.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: squid-mod-external-acl-winbind-group -Section: net -Depends: squid -Priority: optional -Description: winbind group external acl helper diff --git a/package/squid/ipkg/squid-mod-ntlm-auth-fakeauth.control b/package/squid/ipkg/squid-mod-ntlm-auth-fakeauth.control deleted file mode 100644 index 51779ec01..000000000 --- a/package/squid/ipkg/squid-mod-ntlm-auth-fakeauth.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: squid-mod-ntlm-auth-fakeauth -Section: net -Depends: squid -Priority: optional -Description: fakeauht NTLM authentication helper diff --git a/package/squid/ipkg/squid-mod-ntlm-auth-smb-auth.control b/package/squid/ipkg/squid-mod-ntlm-auth-smb-auth.control deleted file mode 100644 index 1561bfa68..000000000 --- a/package/squid/ipkg/squid-mod-ntlm-auth-smb-auth.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: squid-mod-ntlm-auth-smb-auth -Section: net -Depends: squid -Priority: optional -Description: samba NTLM authentication helper diff --git a/package/squid/ipkg/squid-mod-ntlm-auth-winbind-auth.control b/package/squid/ipkg/squid-mod-ntlm-auth-winbind-auth.control deleted file mode 100644 index 1480c2965..000000000 --- a/package/squid/ipkg/squid-mod-ntlm-auth-winbind-auth.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: squid-mod-ntlm-auth-winbind-auth -Section: net -Depends: squid -Priority: optional -Description: winbind NTLM authentication helper diff --git a/package/squid/ipkg/squid.conffiles b/package/squid/ipkg/squid.conffiles deleted file mode 100644 index cd06f9da5..000000000 --- a/package/squid/ipkg/squid.conffiles +++ /dev/null @@ -1,2 +0,0 @@ -/etc/squid/mime.conf -/etc/squid/squid.conf diff --git a/package/squid/ipkg/squid.control b/package/squid/ipkg/squid.control deleted file mode 100644 index 0657eb1ef..000000000 --- a/package/squid/ipkg/squid.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: squid -Section: net -Depends: libopenssl, libpthread -Priority: optional -Description: squid web and cache proxy |