From b70981b68efcce5256eb11c6cd26ae123b10b6ea Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 24 Jul 2009 08:01:31 +0000
Subject: [PATCH] moved extra/* to main/
and fixed misc build issues
---
extra/popt/APKBUILD | 20 -------------------
{extra => main}/acct/APKBUILD | 0
.../acf-alpine-baselayout/APKBUILD | 0
{extra => main}/acf-alpine-conf/APKBUILD | 0
{extra => main}/acf-apk-tools/APKBUILD | 0
{extra => main}/acf-asterisk/APKBUILD | 0
{extra => main}/acf-chrony/APKBUILD | 0
{extra => main}/acf-clamav/APKBUILD | 0
{extra => main}/acf-clamsmtp/APKBUILD | 0
{extra => main}/acf-core/APKBUILD | 0
{extra => main}/acf-dansguardian/APKBUILD | 0
{extra => main}/acf-dhcp/APKBUILD | 0
{extra => main}/acf-dnscache/APKBUILD | 0
{extra => main}/acf-dnsmasq/APKBUILD | 0
{extra => main}/acf-dovecot/APKBUILD | 0
{extra => main}/acf-fetchmail/APKBUILD | 0
{extra => main}/acf-gnats/APKBUILD | 0
{extra => main}/acf-gross/APKBUILD | 0
{extra => main}/acf-ipsec-tools/APKBUILD | 0
{extra => main}/acf-iptables/APKBUILD | 0
{extra => main}/acf-mdadm/APKBUILD | 0
{extra => main}/acf-opennhrp/APKBUILD | 0
{extra => main}/acf-openntpd/APKBUILD | 0
{extra => main}/acf-openssh/APKBUILD | 0
{extra => main}/acf-openssl/APKBUILD | 0
{extra => main}/acf-openvpn/APKBUILD | 0
{extra => main}/acf-pingu/APKBUILD | 0
{extra => main}/acf-postfix/APKBUILD | 0
{extra => main}/acf-postgresql/APKBUILD | 0
{extra => main}/acf-ppp/APKBUILD | 0
{extra => main}/acf-quagga/APKBUILD | 0
{extra => main}/acf-samba/APKBUILD | 0
{extra => main}/acf-shorewall/APKBUILD | 0
{extra => main}/acf-skins/APKBUILD | 0
{extra => main}/acf-snort/APKBUILD | 0
{extra => main}/acf-squid/APKBUILD | 0
{extra => main}/acf-tcpproxy/APKBUILD | 0
{extra => main}/acf-tinydns/APKBUILD | 0
{extra => main}/acf-weblog/APKBUILD | 0
{extra => main}/alsa-lib/APKBUILD | 0
{extra => main}/alsa-lib/nocxx.patch | 0
{extra => main}/amavisd-new/APKBUILD | 0
.../amavisd-new/amavisd-new.post-install | 0
{extra => main}/amavisd-new/amavisd.init | 0
{extra => main}/apr-util/APKBUILD | 0
{extra => main}/apr/APKBUILD | 0
{extra => main}/arpwatch/APKBUILD | 0
{extra => main}/arpwatch/arpwatch.confd | 0
{extra => main}/arpwatch/arpwatch.initd | 0
{extra => main}/aspell/APKBUILD | 0
{extra => main}/aspell/libmath.patch | 0
.../asterisk/100-uclibc-daemon.patch | 0
.../asterisk/101-caps-uclibc.patch | 0
{extra => main}/asterisk/102-gsm-pic.patch | 0
{extra => main}/asterisk/103-rundir.patch | 0
{extra => main}/asterisk/APKBUILD | 0
{extra => main}/asterisk/asterisk.confd | 0
{extra => main}/asterisk/asterisk.initd | 0
.../asterisk/asterisk.post-install | 0
{extra => main}/asterisk/asterisk.pre-install | 0
{extra => main}/aumix/APKBUILD | 0
{extra => main}/aumix/aumix-2.8-mute.patch | 0
{extra => main}/aumix/aumix-2.8-nohome.patch | 0
.../aumix/aumix-2.8-save_load.patch | 0
{extra => main}/aumix/aumix.initd | 0
{extra => main}/b43-fwcutter/APKBUILD | 0
{extra => main}/bc/APKBUILD | 0
{extra => main}/beep/APKBUILD | 0
{extra => main}/beep/beep-1.2.2-nosuid.patch | 0
{extra => main}/bind/APKBUILD | 0
{extra => main}/bind/bind.127.zone | 0
{extra => main}/bind/bind.conf | 0
{extra => main}/bind/bind.confd | 0
{extra => main}/bind/bind.initd | 0
{extra => main}/bind/bind.localhost.zone | 0
{extra => main}/bind/bind.named.ca | 0
{extra => main}/bind/bind.post-install | 0
{extra => main}/bind/bind.pre-install | 0
{extra => main}/bind/bind.so_bsdcompat.patch | 0
{extra => main}/bitlib/APKBUILD | 0
{extra => main}/bridge-utils/APKBUILD | 0
{extra => main}/bzip2/APKBUILD | 0
.../bzip2/bzip2-1.0.4-POSIX-shell.patch | 0
.../bzip2/bzip2-1.0.4-makefile-CFLAGS.patch | 0
.../bzip2/bzip2-1.0.4-man-links.patch | 0
.../bzip2/bzip2-1.0.4-saneso.patch | 0
{extra => main}/bzip2/bzip2.post-deinstall | 0
{extra => main}/c-ares/APKBUILD | 0
{extra => main}/ca-certificates/APKBUILD | 0
.../ca-certificates.post-install | 0
{extra => main}/ccache/APKBUILD | 0
{extra => main}/cdrkit/APKBUILD | 0
{extra => main}/cgit/APKBUILD | 0
{extra => main}/chrony/APKBUILD | 0
...hrony-1.20-chrony.conf.example-gentoo.diff | 0
.../chrony/chrony-1.20-conf.c-gentoo.diff | 0
.../chrony/chrony-1.21-makefile.diff | 0
.../chrony/chrony-1.23-reply-ip.diff | 0
.../chrony/chrony-1.23-sources.diff | 0
{extra => main}/chrony/chrony.conf | 0
{extra => main}/chrony/chronyd.confd | 0
{extra => main}/chrony/chronyd.initd | 0
{extra => main}/cksfv/APKBUILD | 0
{extra => main}/clamav/APKBUILD | 0
.../clamav/clamav-0.95.1-nls.patch | 0
{extra => main}/clamav/clamav.logrotate | 0
{extra => main}/clamav/clamav.post-install | 0
{extra => main}/clamav/clamav.pre-install | 0
{extra => main}/clamav/clamav.pre-upgrade | 0
{extra => main}/clamav/clamd.confd | 0
{extra => main}/clamav/clamd.initd | 0
{extra => main}/clamav/freshclam.confd | 0
{extra => main}/clamav/freshclam.initd | 0
...p-renamed-init.d-script-to-clamsmtpd.patch | 0
{extra => main}/clamsmtp/APKBUILD | 0
.../clamsmtp/clamsmtp.post-upgrade | 0
{extra => main}/clamsmtp/clamsmtp.pre-upgrade | 0
{extra => main}/clamsmtp/clamsmtpd.confd | 0
{extra => main}/clamsmtp/clamsmtpd.initd | 0
{extra => main}/cmake/APKBUILD | 0
{extra => main}/conntrack-tools/APKBUILD | 0
.../conntrack-tools/conntrackd.confd | 0
.../conntrack-tools/conntrackd.initd | 0
{extra => main}/coreutils/APKBUILD | 0
.../coreutils/coreutils.post-deinstall | 0
.../coreutils/coreutils.post-upgrade | 0
{extra => main}/cpufreqd/APKBUILD | 0
{extra => main}/cpufreqd/cpufreqd.initd | 0
{extra => main}/cpufrequtils/APKBUILD | 0
.../cpufrequtils/cpufrequtils-005-build.patch | 0
.../cpufrequtils/cpufrequtils-005-nls.patch | 0
.../cpufrequtils/cpufrequtils.confd | 0
.../cpufrequtils/cpufrequtils.initd | 0
{extra => main}/cracklib-words/APKBUILD | 0
{extra => main}/cracklib/APKBUILD | 0
{extra => main}/ctags/APKBUILD | 0
{extra => main}/cutter/APKBUILD | 0
{extra => main}/cvs/APKBUILD | 0
{extra => main}/cyrus-sasl/APKBUILD | 0
.../cyrus-sasl-2.1.19-checkpw.c.patch | 0
{extra => main}/cyrus-sasl/db-4.7.patch | 0
{extra => main}/cyrus-sasl/saslauthd.initd | 0
{extra => main}/dahdi-linux-grsec/APKBUILD | 0
.../dahdi-linux-grsec/dahdi-bri_dchan.patch | 0
.../dahdi-linux-grsec/dahdi-depmod.patch | 0
.../dahdi-linux-2.2.0-hfc-4s.patch | 0
.../dahdi-linux-grsec/dahdi-zaphfc.patch | 0
.../zaphfc-dahdi-flortz.diff | 0
{extra => main}/dahdi-linux/APKBUILD | 0
{extra => main}/dahdi-tools/APKBUILD | 0
{extra => main}/dahdi-tools/dahdi-tools.initd | 0
{extra => main}/dansguardian/APKBUILD | 0
.../dansguardian/dansguardian.initd | 0
.../dansguardian/dansguardian.pre-install | 0
{extra => main}/db/APKBUILD | 0
{extra => main}/db/patch.4.7.25.1 | 0
{extra => main}/db/patch.4.7.25.2 | 0
{extra => main}/db/patch.4.7.25.3 | 0
{extra => main}/db/patch.4.7.25.4 | 0
{extra => main}/dhcp/APKBUILD | 0
{extra => main}/dhcp/dhcp.post-upgrade | 0
{extra => main}/dhcp/dhcp.pre-upgrade | 0
{extra => main}/dhcp/dhcpd.confd | 0
{extra => main}/dhcp/dhcpd.initd | 0
{extra => main}/dhcpcd/APKBUILD | 0
{extra => main}/dialog/APKBUILD | 0
{extra => main}/diffutils/APKBUILD | 0
.../diffutils/diffutils.post-deinstall | 0
.../dircproxy/1.0.5-CVE-2007-5226.patch | 0
.../dircproxy/1.1.0-less-lag-on-attach.patch | 0
{extra => main}/dircproxy/APKBUILD | 0
.../dircproxy/dircproxy-gcc4.patch | 0
{extra => main}/djbdns/1.05-errno.patch | 0
{extra => main}/djbdns/1.05-response.patch | 0
{extra => main}/djbdns/APKBUILD | 0
{extra => main}/djbdns/dnscache.confd | 0
{extra => main}/djbdns/dnscache.initd | 0
{extra => main}/djbdns/dnscache.pre-install | 0
{extra => main}/djbdns/dnsroots.patch | 0
{extra => main}/djbdns/dnstracesort.patch | 0
{extra => main}/djbdns/headtail.patch | 0
{extra => main}/djbdns/tinydns.confd | 0
{extra => main}/djbdns/tinydns.initd | 0
{extra => main}/djbdns/tinydns.pre-install | 0
{extra => main}/dnsmasq/APKBUILD | 0
{extra => main}/dnsmasq/dnsmasq.confd | 0
{extra => main}/dnsmasq/dnsmasq.initd | 0
{extra => main}/dovecot/APKBUILD | 0
{extra => main}/dovecot/dovecot.initd | 0
{extra => main}/dovecot/dovecot.pre-install | 0
{extra => main}/dropbear/APKBUILD | 0
{extra => main}/dropbear/dropbear.confd | 0
{extra => main}/dropbear/dropbear.initd | 0
{extra => main}/dtach/APKBUILD | 0
{extra => main}/eggdrop/APKBUILD | 0
{extra => main}/eggdrop/eggdrop-installer | 0
{extra => main}/eggdrop/eggdrop.post-install | 0
{extra => main}/eggdrop/gseen.mod.patch | 0
{extra => main}/eggdrop/logs2html.mod.patch | 0
{extra => main}/email/APKBUILD | 0
{extra => main}/email/email-3.1.0-doc.patch | 0
.../email/email-3.1.0-ldflags.patch | 0
{extra => main}/espeak/APKBUILD | 0
.../espeak/espeak-1.40.02-uclibc++.patch | 0
{extra => main}/ethtool/APKBUILD | 0
{extra => main}/faac/APKBUILD | 0
{extra => main}/faad2/APKBUILD | 0
.../fcgi/10-fcgi-2.4.0-Makefile.patch | 0
.../20-fcgi-2.4.0-clientdata-pointer.patch | 0
.../fcgi/30-fcgi-2.4.0-html-updates.patch | 0
{extra => main}/fcgi/APKBUILD | 0
{extra => main}/fetchmail/APKBUILD | 0
{extra => main}/fetchmail/fetchmail.initd | 0
.../fetchmail/fetchmail.post-install | 0
.../fetchmail/fetchmail.pre-install | 0
{extra => main}/flac/APKBUILD | 0
{extra => main}/fping/APKBUILD | 0
{extra => main}/freetds/APKBUILD | 0
{extra => main}/freetype/10-bytecode.patch | 0
{extra => main}/freetype/20-enable-spr.patch | 0
.../freetype/30-enable-valid.patch | 0
{extra => main}/freetype/40-memcpy-fix.patch | 0
{extra => main}/freetype/APKBUILD | 0
{extra => main}/gawk/APKBUILD | 0
{extra => main}/gawk/gawk.post-deinstall | 0
{extra => main}/gd/APKBUILD | 0
{extra => main}/gdb/50_all_gdb-pie-1.patch | 0
{extra => main}/gdb/50_all_gdb-pie-2.patch | 0
{extra => main}/gdb/APKBUILD | 0
.../10-gdbm-1.8.3-fix-install-ownership.patch | 0
.../gdbm/20-gdbm-1.8.3-compat-linking.patch | 0
.../gdbm/30-gdbm-1.8.3-build.patch | 0
{extra => main}/gdbm/APKBUILD | 0
{extra => main}/gettext/APKBUILD | 0
{extra => main}/ghostscript/APKBUILD | 0
{extra => main}/glib/APKBUILD | 0
{extra => main}/gnats/APKBUILD | 0
{extra => main}/gnats/gnats.pre-install | 0
{extra => main}/gnupg/APKBUILD | 0
{extra => main}/gnutls/APKBUILD | 0
{extra => main}/gperf/APKBUILD | 0
{extra => main}/grep/APKBUILD | 0
{extra => main}/grep/grep.post-deinstall | 0
{extra => main}/gross/APKBUILD | 0
.../gross/gross-1.0.1-configure.ac.patch | 0
.../gross/gross-1.0.1-default-conf.patch | 0
{extra => main}/gross/gross-1.0.1-user.patch | 0
{extra => main}/gross/gross.post-install | 0
{extra => main}/gross/gross.post-upgrade | 0
{extra => main}/gross/gross.pre-install | 0
{extra => main}/gross/gross.pre-upgrade | 0
{extra => main}/gross/grossd.confd | 0
{extra => main}/gross/grossd.initd | 0
{extra => main}/gzip/APKBUILD | 0
{extra => main}/gzip/gzip.post-deinstall | 0
{extra => main}/haserl/APKBUILD | 0
.../heimdal/001_all_heimdal-no_libedit.patch | 0
.../heimdal/002_all_heimdal-fPIC.patch | 0
.../heimdal/003_all_heimdal-rxapps.patch | 0
.../heimdal/005_all_heimdal-suid_fix.patch | 0
.../heimdal/013_all_heimdal-pthread-lib.patch | 0
.../heimdal/014_all_heimdal-path.patch | 0
.../heimdal/022_all_heimdal-as-needed.patch | 0
{extra => main}/heimdal/APKBUILD | 0
{extra => main}/heimdal/heimdal-kadmind.init | 0
{extra => main}/heimdal/heimdal-kdc.init | 0
{extra => main}/heimdal/heimdal-kpasswdd.init | 0
.../heimdal-r23235-kb5-libwind_la.patch | 0
.../heimdal-r23238-kb5_locl_h-wind_h.patch | 0
.../heimdal/heimdal-system_sqlite.patch | 0
{extra => main}/htop/APKBUILD | 0
{extra => main}/hunspell/APKBUILD | 0
{extra => main}/hylafax/APKBUILD | 0
{extra => main}/hylafax/hylafax.post-install | 0
{extra => main}/hypermail/APKBUILD | 0
{extra => main}/hypermail/mdir2mbox.lua | 0
{extra => main}/iaxmodem/APKBUILD | 0
{extra => main}/iaxmodem/iaxmodem.confd | 0
{extra => main}/iaxmodem/iaxmodem.initd | 0
{extra => main}/iaxmodem/nocxx.patch | 0
{extra => main}/icu/APKBUILD | 0
{extra => main}/imagemagick/APKBUILD | 0
{extra => main}/iproute2-qos/APKBUILD | 0
{extra => main}/iproute2-qos/qos.confd | 0
{extra => main}/iproute2-qos/qos.initd | 0
{extra => main}/iproute2-qos/setup-qos | 0
.../ipsec-tools/00-verify-cert-leak.patch | 0
.../ipsec-tools/20-natoa-fix.patch | 0
.../ipsec-tools/30-natt-ports-cleanup.patch | 0
.../ipsec-tools/40-cmpsaddr-cleanup.patch | 0
.../ipsec-tools/50-reverse-connect.patch | 0
.../ipsec-tools/60-debug-quick.patch | 0
{extra => main}/ipsec-tools/APKBUILD | 0
{extra => main}/ipsec-tools/racoon.confd | 0
{extra => main}/ipsec-tools/racoon.initd | 0
{extra => main}/iptraf/APKBUILD | 0
{extra => main}/iputils/APKBUILD | 0
.../iputils-20070202-no-open-max.patch | 0
{extra => main}/iputils/iputils.post-install | 0
{extra => main}/irssi/APKBUILD | 0
{extra => main}/jpeg/APKBUILD | 0
{extra => main}/json4lua/APKBUILD | 0
{extra => main}/ksymoops/APKBUILD | 0
{extra => main}/less/APKBUILD | 0
{extra => main}/less/less.post-deinstall | 0
{extra => main}/lftp/APKBUILD | 0
{extra => main}/lha/APKBUILD | 0
{extra => main}/libao/APKBUILD | 0
{extra => main}/libart-lgpl/APKBUILD | 0
{extra => main}/libassuan/APKBUILD | 0
{extra => main}/libcap/APKBUILD | 13 ++++++++----
main/libcap/include-order.patch | 16 +++++++++++++++
{extra => main}/libconfig/APKBUILD | 0
{extra => main}/libexif/APKBUILD | 0
{extra => main}/libgcrypt/APKBUILD | 0
{extra => main}/libgcrypt/nocxx.patch | 0
{extra => main}/libgpg-error/APKBUILD | 0
{extra => main}/libgpg-error/nocxx.patch | 0
{extra => main}/libiconv/APKBUILD | 0
{extra => main}/libid3tag/APKBUILD | 0
{extra => main}/libidn/APKBUILD | 0
{extra => main}/libksba/APKBUILD | 0
{extra => main}/libmcrypt/APKBUILD | 0
{extra => main}/libnet/APKBUILD | 0
.../libnet/libnet-1.1.2.1-autotools.patch | 0
.../libnet/libnet-1.1.2.1-fix-chksum.patch | 0
.../libnetfilter_conntrack/APKBUILD | 0
{extra => main}/libnfnetlink/APKBUILD | 0
{extra => main}/libogg/APKBUILD | 8 +++-----
{extra => main}/libogg/nocxx.patch | 0
{extra => main}/libpng/APKBUILD | 0
{extra => main}/libpri/APKBUILD | 0
.../libpri/libpri-1.4.9-i14292.patch | 0
{extra => main}/libpri/libpri-cflags.patch | 0
{extra => main}/libsamplerate/APKBUILD | 0
{extra => main}/libsndfile/APKBUILD | 0
{extra => main}/libtasn1/APKBUILD | 0
{extra => main}/libtheora/APKBUILD | 0
{extra => main}/libusb-compat/APKBUILD | 0
{extra => main}/libusb/APKBUILD | 0
{extra => main}/libvorbis/APKBUILD | 0
{extra => main}/libxml2/APKBUILD | 0
{extra => main}/libxml2/nocxx.patch | 0
{extra => main}/libxslt/APKBUILD | 0
{extra => main}/lighttpd/APKBUILD | 0
{extra => main}/lighttpd/lighttpd.conf | 0
{extra => main}/lighttpd/lighttpd.confd | 0
{extra => main}/lighttpd/lighttpd.initd | 0
{extra => main}/lighttpd/lighttpd.logrotate | 0
.../lighttpd/lighttpd.post-install | 0
{extra => main}/lighttpd/lighttpd.pre-install | 0
{extra => main}/lighttpd/mime-types.conf | 0
{extra => main}/lighttpd/mod_cgi.conf | 0
{extra => main}/lighttpd/mod_fastcgi.conf | 0
{extra => main}/lighttpd/spawn-fcgi.confd | 0
{extra => main}/lighttpd/spawn-fcgi.initd | 0
{extra => main}/links/APKBUILD | 0
{extra => main}/lm_sensors/APKBUILD | 0
{extra => main}/lm_sensors/fancontrol.initd | 0
..._sensors-3.1.0-sensors-detect-alpine.patch | 0
{extra => main}/lm_sensors/lm_sensors.initd | 0
{extra => main}/lm_sensors/sensord.confd | 0
{extra => main}/lm_sensors/sensord.initd | 0
{extra => main}/lm_sensors/sensors.install | 0
{extra => main}/logrotate/APKBUILD | 0
{extra => main}/lpc/APKBUILD | 0
{extra => main}/lua/APKBUILD | 0
{extra => main}/lua/lua-5.1-make.patch | 0
.../lua/lua-5.1-module_paths.patch | 0
{extra => main}/luaposix/APKBUILD | 0
{extra => main}/luasql-postgres/APKBUILD | 0
{extra => main}/luasql-postgres/config.new | 0
{extra => main}/lzo/APKBUILD | 0
{extra => main}/man-pages/APKBUILD | 0
{extra => main}/man/APKBUILD | 0
{extra => main}/man/man-troff.patch | 0
{extra => main}/man/whatis.periodic.daily | 0
{extra => main}/md5/APKBUILD | 0
{extra => main}/mini_httpd/APKBUILD | 0
.../mini_httpd/mini_httpd.conf.sample | 0
{extra => main}/mini_httpd/mini_httpd.initd | 0
{extra => main}/mlmmj/APKBUILD | 0
{extra => main}/mpg123/APKBUILD | 0
{extra => main}/mysql/APKBUILD | 0
{extra => main}/mysql/mysql.initd | 0
{extra => main}/mysql/mysql.mycnf | 0
{extra => main}/nano/APKBUILD | 0
{extra => main}/ncftp/APKBUILD | 0
{extra => main}/ncftp/ncftp.post-install | 0
{extra => main}/neon/APKBUILD | 0
{extra => main}/net-snmp/APKBUILD | 4 ++--
{extra => main}/net-snmp/snmpd.confd | 0
{extra => main}/net-snmp/snmpd.initd | 0
{extra => main}/net-snmp/snmptrapd.confd | 0
{extra => main}/net-snmp/snmptrapd.initd | 0
{extra => main}/newt/APKBUILD | 0
{extra => main}/newt/newt-0.52.7-notcl.patch | 0
{extra => main}/nfs-utils/APKBUILD | 0
.../nfs-utils/nfs-utils-mtab-sym.patch | 0
.../nfs-utils/nfs-utils-no-exec.patch | 0
{extra => main}/nfs-utils/nfs.confd | 0
{extra => main}/nfs-utils/nfs.exports | 0
{extra => main}/nfs-utils/nfs.initd | 0
{extra => main}/ngircd/APKBUILD | 0
{extra => main}/ngircd/ngircd.initd | 0
{extra => main}/ngircd/ngircd.pre-install | 0
{extra => main}/nmap/APKBUILD | 0
.../nmap/nmap-4.53-uclibc++-output.cc.patch | 0
{extra => main}/ntfs-3g/APKBUILD | 0
{extra => main}/ntfs-3g/nocxx.patch | 0
{extra => main}/oidentd/APKBUILD | 0
{extra => main}/oidentd/oidentd.conf | 0
{extra => main}/oidentd/oidentd.confd | 0
{extra => main}/oidentd/oidentd.initd | 0
{extra => main}/openldap/APKBUILD | 0
.../openldap/openldap-2.4-ppolicy.patch | 0
.../openldap/openldap-2.4.11-libldap_r.patch | 0
.../openldap/openldap.post-install | 0
{extra => main}/openldap/openldap.pre-install | 0
{extra => main}/openldap/slapd.confd | 0
{extra => main}/openldap/slapd.initd | 0
{extra => main}/openldap/slurpd.initd | 0
{extra => main}/opennhrp/APKBUILD | 0
.../opennhrp-0.9.2-fix-false-assert.patch | 0
.../opennhrp/opennhrp-0.9.3-peer-up-bgp.patch | 0
{extra => main}/opennhrp/opennhrp.confd | 0
{extra => main}/opennhrp/opennhrp.initd | 0
{extra => main}/openvpn/APKBUILD | 0
.../openvpn/openvpn-2.0.9-persistent.patch | 0
{extra => main}/openvpn/openvpn.initd | 0
{extra => main}/p7zip/APKBUILD | 0
{extra => main}/p7zip/p7zip-cc-cxx.patch | 0
{extra => main}/pciutils/APKBUILD | 0
{extra => main}/pcmciautils/APKBUILD | 0
{extra => main}/pcre/APKBUILD | 0
{extra => main}/perl-archive-zip/APKBUILD | 0
{extra => main}/perl-convert-binhex/APKBUILD | 0
{extra => main}/perl-convert-tnef/APKBUILD | 0
{extra => main}/perl-convert-uulib/APKBUILD | 0
.../perl-crypt-openssl-random/APKBUILD | 0
.../perl-crypt-openssl-rsa/APKBUILD | 0
{extra => main}/perl-db/APKBUILD | 0
{extra => main}/perl-db_file/APKBUILD | 0
{extra => main}/perl-digest-sha1/APKBUILD | 0
{extra => main}/perl-getopt-long/APKBUILD | 0
{extra => main}/perl-html-parser/APKBUILD | 0
{extra => main}/perl-inline/APKBUILD | 0
{extra => main}/perl-io-stringy/APKBUILD | 0
{extra => main}/perl-mail-clamav/APKBUILD | 0
{extra => main}/perl-mail-dkim/APKBUILD | 0
{extra => main}/perl-mail-domainkeys/APKBUILD | 0
.../perl-mail-spamassassin/APKBUILD | 0
{extra => main}/perl-mail-spf/APKBUILD | 0
{extra => main}/perl-mail-tools/APKBUILD | 0
{extra => main}/perl-mime-tools/APKBUILD | 0
{extra => main}/perl-net-dns/APKBUILD | 0
{extra => main}/perl-net-ip/APKBUILD | 0
{extra => main}/perl-net-server/APKBUILD | 0
.../perl-parse-recdescent/APKBUILD | 0
{extra => main}/perl-test-pod/APKBUILD | 0
{extra => main}/perl-time-date/APKBUILD | 0
{extra => main}/perl-unix-syslog/APKBUILD | 0
{extra => main}/perl-uri-escape/APKBUILD | 0
{extra => main}/perl-uri/APKBUILD | 0
{extra => main}/perl-xml-parser/APKBUILD | 0
{extra => main}/perl-xml-simple/APKBUILD | 0
{extra => main}/pgcluster/APKBUILD | 0
{extra => main}/pgcluster/pgcluster.confd | 0
{extra => main}/pgcluster/pgcluster.initd | 0
{extra => main}/pgpool/APKBUILD | 0
{extra => main}/pgpool/pgpool.initd | 0
{extra => main}/php-apc/APKBUILD | 0
{extra => main}/php-apc/apc.ini | 0
{extra => main}/php-fileinfo/APKBUILD | 0
{extra => main}/php-fileinfo/magic.patch | 0
{extra => main}/php/APKBUILD | 0
{extra => main}/pinentry/APKBUILD | 0
{extra => main}/pingu/APKBUILD | 0
{extra => main}/pingu/pingu.initd | 0
{extra => main}/portmap/APKBUILD | 0
.../portmap/portmap-6.0-tcpd.patch | 0
{extra => main}/portmap/portmap.confd | 0
{extra => main}/portmap/portmap.initd | 0
{extra => main}/portmap/portmap.pre-install | 0
{extra => main}/postfix/APKBUILD | 0
{extra => main}/postfix/dynamicmaps.cf | 0
.../postfix/postfix-2.6.1-dynamicmaps.patch | 0
.../postfix/postfix-ldap.post-install | 0
.../postfix/postfix-mysql.post-install | 0
.../postfix/postfix-pcre.post-install | 0
.../postfix/postfix-pgsql.post-install | 0
{extra => main}/postfix/postfix.initd | 0
{extra => main}/postfix/postfix.post-install | 0
{extra => main}/postfix/postfix.pre-install | 0
{extra => main}/postgresql/APKBUILD | 0
{extra => main}/postgresql/postgresql.confd | 0
{extra => main}/postgresql/postgresql.initd | 0
{extra => main}/pth/APKBUILD | 0
.../pth/pth-2.0.5-parallelfix.patch | 0
{extra => main}/pth/pth-2.0.6-ldflags.patch | 0
{extra => main}/pth/pth-2.0.6-sigstack.patch | 0
{extra => main}/python/APKBUILD | 0
.../python/python-2.6-internal-expat.patch | 0
{extra => main}/quagga/APKBUILD | 0
{extra => main}/quagga/bgpd.initd | 0
{extra => main}/quagga/ospf6d.initd | 0
{extra => main}/quagga/ospfd.initd | 0
.../quagga/quagga-0.99.11-del-routes.patch | 0
.../quagga/quagga-0.99.11-fd-leak.patch | 0
.../quagga/quagga-0.99.11-ipv6-only.patch | 0
.../quagga/quagga-0.99.11-link-libcap.patch | 0
.../quagga/quagga-0.99.11-zombie.patch | 0
{extra => main}/quagga/quagga.post-install | 0
{extra => main}/quagga/quagga.pre-install | 0
{extra => main}/quagga/ripd.initd | 0
{extra => main}/quagga/ripngd.initd | 0
{extra => main}/quagga/zebra.confd | 0
{extra => main}/quagga/zebra.initd | 0
{extra => main}/razor/APKBUILD | 0
{extra => main}/roundcubemail/APKBUILD | 0
{extra => main}/rrdtool/APKBUILD | 0
{extra => main}/rsync/APKBUILD | 0
{extra => main}/rsync/rsyncd.conf | 0
{extra => main}/rsync/rsyncd.confd | 0
{extra => main}/rsync/rsyncd.initd | 0
{extra => main}/rsync/rsyncd.logrotate | 0
{extra => main}/ruby/APKBUILD | 0
{extra => main}/rubygems/APKBUILD | 0
.../rubygems/rubygems-1.3.1-setup.patch | 0
{extra => main}/run-parts/APKBUILD | 0
{extra => main}/samba/APKBUILD | 0
{extra => main}/samba/samba.confd | 0
{extra => main}/samba/samba.initd | 0
{extra => main}/screen/APKBUILD | 0
{extra => main}/screen/screen-4.0.3.patch | 0
{extra => main}/sed/APKBUILD | 0
{extra => main}/sed/sed.post-deinstall | 0
{extra => main}/sfic/APKBUILD | 0
{extra => main}/sfic/sfic-0.1.7-signal.patch | 0
{extra => main}/shorewall-common/APKBUILD | 0
.../shorewall-common/shorewall.initd | 0
{extra => main}/shorewall-lite/APKBUILD | 0
.../shorewall-lite/shorewall-lite.initd | 0
{extra => main}/shorewall-perl/APKBUILD | 0
{extra => main}/shorewall-shell/APKBUILD | 0
{extra => main}/shorewall/APKBUILD | 0
{extra => main}/sic/APKBUILD | 0
{extra => main}/slang/APKBUILD | 0
.../slang/slang-2.1.3-uclibc.patch | 0
{extra => main}/snort/APKBUILD | 0
{extra => main}/snort/nocxx.patch | 0
{extra => main}/snort/snort.confd | 0
{extra => main}/snort/snort.initd | 0
{extra => main}/snort/snort.pre-install | 0
{extra => main}/sntpc/APKBUILD | 0
{extra => main}/sntpc/sntpc.confd | 0
{extra => main}/sntpc/sntpc.initd | 0
{extra => main}/spamassassin/APKBUILD | 0
{extra => main}/spamassassin/spamd.conf | 0
{extra => main}/spamassassin/spamd.init | 0
{extra => main}/sqlite/APKBUILD | 0
{extra => main}/sqlite/license.txt | 0
{extra => main}/squid/APKBUILD | 0
{extra => main}/squid/squid-2.7-gentoo.patch | 0
{extra => main}/squid/squid.confd | 0
{extra => main}/squid/squid.initd | 0
{extra => main}/squid/squid.logrotate | 0
{extra => main}/squid/squid.post-install | 0
{extra => main}/ssmtp/APKBUILD | 0
{extra => main}/ssmtp/CVE-2008-3962.patch | 0
{extra => main}/ssmtp/generate_config.patch | 0
{extra => main}/strace/APKBUILD | 0
{extra => main}/subversion/APKBUILD | 0
.../subversion/subversion.pre-install | 0
{extra => main}/subversion/svnserve.confd | 0
{extra => main}/subversion/svnserve.initd | 0
{extra => main}/sysfsutils/APKBUILD | 0
{extra => main}/sysklogd/APKBUILD | 0
{extra => main}/sysklogd/LICENSE | 0
...sklogd-1.4.2-caen-owl-klogd-drop-root.diff | 0
.../sysklogd-1.4.2-caen-owl-syslogd-bind.diff | 0
...logd-1.4.2-caen-owl-syslogd-drop-root.diff | 0
.../sysklogd/sysklogd-1.5-build.patch | 0
{extra => main}/sysklogd/sysklogd.confd | 0
{extra => main}/sysklogd/sysklogd.initd | 0
{extra => main}/sysklogd/sysklogd.logrotate | 0
{extra => main}/sysstat/APKBUILD | 0
{extra => main}/tar/APKBUILD | 0
{extra => main}/tar/tar.post-deinstall | 0
{extra => main}/tcl/APKBUILD | 0
{extra => main}/tcpdump/APKBUILD | 0
{extra => main}/tcpproxy/APKBUILD | 9 +++++----
{extra => main}/tcpproxy/tcpproxy.initd | 0
{extra => main}/tiff/APKBUILD | 0
{extra => main}/tinyproxy/APKBUILD | 0
{extra => main}/tinyproxy/tinyproxy.initd | 0
{extra => main}/tinyproxy/tinyproxy.install | 0
{extra => main}/tmux/APKBUILD | 0
{extra => main}/tmux/build.patch | 0
{extra => main}/transmission/APKBUILD | 0
.../transmission/transmission-daemon.confd | 0
.../transmission/transmission-daemon.initd | 0
.../transmission/transmission.pre-install | 0
{extra => main}/udev/APKBUILD | 0
.../udev/move_tmp_persistent_rules.sh | 0
{extra => main}/udev/udev-mount.initd | 0
{extra => main}/udev/udev-postmount.initd | 0
{extra => main}/udev/udev-start.sh | 0
{extra => main}/udev/udev.initd | 0
{extra => main}/udev/write_root_link_rule | 0
{extra => main}/uiconv/APKBUILD | 0
{extra => main}/unarj/APKBUILD | 0
{extra => main}/unfs3/APKBUILD | 0
{extra => main}/unixodbc/APKBUILD | 0
{extra => main}/unrar/APKBUILD | 0
{extra => main}/usbutils/APKBUILD | 0
{extra => main}/v86d/APKBUILD | 0
{extra => main}/v86d/modprobe.uvesafb | 0
{extra => main}/vala/APKBUILD | 0
{extra => main}/valgrind/APKBUILD | 0
.../valgrind/valgrind-3.4.0-uclibc.patch | 0
{extra => main}/vim/APKBUILD | 0
{extra => main}/vim/vimrc | 0
{extra => main}/vsftpd/APKBUILD | 0
.../vsftpd/vsftpd-enable-ssl.patch | 0
{extra => main}/vsftpd/vsftpd.confd | 0
{extra => main}/vsftpd/vsftpd.initd | 0
{extra => main}/wget/APKBUILD | 0
{extra => main}/wget/wget.post-deinstall | 0
{extra => main}/xvidcore/APKBUILD | 0
{extra => main}/zip/10-zip-3.0-build.patch | 0
.../zip/20-zip-3.0-exec-stack.patch | 0
{extra => main}/zip/30-zip-3.0-pic.patch | 0
{extra => main}/zip/APKBUILD | 0
{extra => main}/zonenotify/APKBUILD | 0
635 files changed, 35 insertions(+), 35 deletions(-)
delete mode 100644 extra/popt/APKBUILD
rename {extra => main}/acct/APKBUILD (100%)
rename {extra => main}/acf-alpine-baselayout/APKBUILD (100%)
rename {extra => main}/acf-alpine-conf/APKBUILD (100%)
rename {extra => main}/acf-apk-tools/APKBUILD (100%)
rename {extra => main}/acf-asterisk/APKBUILD (100%)
rename {extra => main}/acf-chrony/APKBUILD (100%)
rename {extra => main}/acf-clamav/APKBUILD (100%)
rename {extra => main}/acf-clamsmtp/APKBUILD (100%)
rename {extra => main}/acf-core/APKBUILD (100%)
rename {extra => main}/acf-dansguardian/APKBUILD (100%)
rename {extra => main}/acf-dhcp/APKBUILD (100%)
rename {extra => main}/acf-dnscache/APKBUILD (100%)
rename {extra => main}/acf-dnsmasq/APKBUILD (100%)
rename {extra => main}/acf-dovecot/APKBUILD (100%)
rename {extra => main}/acf-fetchmail/APKBUILD (100%)
rename {extra => main}/acf-gnats/APKBUILD (100%)
rename {extra => main}/acf-gross/APKBUILD (100%)
rename {extra => main}/acf-ipsec-tools/APKBUILD (100%)
rename {extra => main}/acf-iptables/APKBUILD (100%)
rename {extra => main}/acf-mdadm/APKBUILD (100%)
rename {extra => main}/acf-opennhrp/APKBUILD (100%)
rename {extra => main}/acf-openntpd/APKBUILD (100%)
rename {extra => main}/acf-openssh/APKBUILD (100%)
rename {extra => main}/acf-openssl/APKBUILD (100%)
rename {extra => main}/acf-openvpn/APKBUILD (100%)
rename {extra => main}/acf-pingu/APKBUILD (100%)
rename {extra => main}/acf-postfix/APKBUILD (100%)
rename {extra => main}/acf-postgresql/APKBUILD (100%)
rename {extra => main}/acf-ppp/APKBUILD (100%)
rename {extra => main}/acf-quagga/APKBUILD (100%)
rename {extra => main}/acf-samba/APKBUILD (100%)
rename {extra => main}/acf-shorewall/APKBUILD (100%)
rename {extra => main}/acf-skins/APKBUILD (100%)
rename {extra => main}/acf-snort/APKBUILD (100%)
rename {extra => main}/acf-squid/APKBUILD (100%)
rename {extra => main}/acf-tcpproxy/APKBUILD (100%)
rename {extra => main}/acf-tinydns/APKBUILD (100%)
rename {extra => main}/acf-weblog/APKBUILD (100%)
rename {extra => main}/alsa-lib/APKBUILD (100%)
rename {extra => main}/alsa-lib/nocxx.patch (100%)
rename {extra => main}/amavisd-new/APKBUILD (100%)
rename {extra => main}/amavisd-new/amavisd-new.post-install (100%)
rename {extra => main}/amavisd-new/amavisd.init (100%)
rename {extra => main}/apr-util/APKBUILD (100%)
rename {extra => main}/apr/APKBUILD (100%)
rename {extra => main}/arpwatch/APKBUILD (100%)
rename {extra => main}/arpwatch/arpwatch.confd (100%)
rename {extra => main}/arpwatch/arpwatch.initd (100%)
rename {extra => main}/aspell/APKBUILD (100%)
rename {extra => main}/aspell/libmath.patch (100%)
rename {extra => main}/asterisk/100-uclibc-daemon.patch (100%)
rename {extra => main}/asterisk/101-caps-uclibc.patch (100%)
rename {extra => main}/asterisk/102-gsm-pic.patch (100%)
rename {extra => main}/asterisk/103-rundir.patch (100%)
rename {extra => main}/asterisk/APKBUILD (100%)
rename {extra => main}/asterisk/asterisk.confd (100%)
rename {extra => main}/asterisk/asterisk.initd (100%)
rename {extra => main}/asterisk/asterisk.post-install (100%)
rename {extra => main}/asterisk/asterisk.pre-install (100%)
rename {extra => main}/aumix/APKBUILD (100%)
rename {extra => main}/aumix/aumix-2.8-mute.patch (100%)
rename {extra => main}/aumix/aumix-2.8-nohome.patch (100%)
rename {extra => main}/aumix/aumix-2.8-save_load.patch (100%)
rename {extra => main}/aumix/aumix.initd (100%)
rename {extra => main}/b43-fwcutter/APKBUILD (100%)
rename {extra => main}/bc/APKBUILD (100%)
rename {extra => main}/beep/APKBUILD (100%)
rename {extra => main}/beep/beep-1.2.2-nosuid.patch (100%)
rename {extra => main}/bind/APKBUILD (100%)
rename {extra => main}/bind/bind.127.zone (100%)
rename {extra => main}/bind/bind.conf (100%)
rename {extra => main}/bind/bind.confd (100%)
rename {extra => main}/bind/bind.initd (100%)
rename {extra => main}/bind/bind.localhost.zone (100%)
rename {extra => main}/bind/bind.named.ca (100%)
rename {extra => main}/bind/bind.post-install (100%)
rename {extra => main}/bind/bind.pre-install (100%)
rename {extra => main}/bind/bind.so_bsdcompat.patch (100%)
rename {extra => main}/bitlib/APKBUILD (100%)
rename {extra => main}/bridge-utils/APKBUILD (100%)
rename {extra => main}/bzip2/APKBUILD (100%)
rename {extra => main}/bzip2/bzip2-1.0.4-POSIX-shell.patch (100%)
rename {extra => main}/bzip2/bzip2-1.0.4-makefile-CFLAGS.patch (100%)
rename {extra => main}/bzip2/bzip2-1.0.4-man-links.patch (100%)
rename {extra => main}/bzip2/bzip2-1.0.4-saneso.patch (100%)
rename {extra => main}/bzip2/bzip2.post-deinstall (100%)
rename {extra => main}/c-ares/APKBUILD (100%)
rename {extra => main}/ca-certificates/APKBUILD (100%)
rename {extra => main}/ca-certificates/ca-certificates.post-install (100%)
rename {extra => main}/ccache/APKBUILD (100%)
rename {extra => main}/cdrkit/APKBUILD (100%)
rename {extra => main}/cgit/APKBUILD (100%)
rename {extra => main}/chrony/APKBUILD (100%)
rename {extra => main}/chrony/chrony-1.20-chrony.conf.example-gentoo.diff (100%)
rename {extra => main}/chrony/chrony-1.20-conf.c-gentoo.diff (100%)
rename {extra => main}/chrony/chrony-1.21-makefile.diff (100%)
rename {extra => main}/chrony/chrony-1.23-reply-ip.diff (100%)
rename {extra => main}/chrony/chrony-1.23-sources.diff (100%)
rename {extra => main}/chrony/chrony.conf (100%)
rename {extra => main}/chrony/chronyd.confd (100%)
rename {extra => main}/chrony/chronyd.initd (100%)
rename {extra => main}/cksfv/APKBUILD (100%)
rename {extra => main}/clamav/APKBUILD (100%)
rename {extra => main}/clamav/clamav-0.95.1-nls.patch (100%)
rename {extra => main}/clamav/clamav.logrotate (100%)
rename {extra => main}/clamav/clamav.post-install (100%)
rename {extra => main}/clamav/clamav.pre-install (100%)
rename {extra => main}/clamav/clamav.pre-upgrade (100%)
rename {extra => main}/clamav/clamd.confd (100%)
rename {extra => main}/clamav/clamd.initd (100%)
rename {extra => main}/clamav/freshclam.confd (100%)
rename {extra => main}/clamav/freshclam.initd (100%)
rename {extra => main}/clamsmtp/0001-extra-clamsmtp-renamed-init.d-script-to-clamsmtpd.patch (100%)
rename {extra => main}/clamsmtp/APKBUILD (100%)
rename {extra => main}/clamsmtp/clamsmtp.post-upgrade (100%)
rename {extra => main}/clamsmtp/clamsmtp.pre-upgrade (100%)
rename {extra => main}/clamsmtp/clamsmtpd.confd (100%)
rename {extra => main}/clamsmtp/clamsmtpd.initd (100%)
rename {extra => main}/cmake/APKBUILD (100%)
rename {extra => main}/conntrack-tools/APKBUILD (100%)
rename {extra => main}/conntrack-tools/conntrackd.confd (100%)
rename {extra => main}/conntrack-tools/conntrackd.initd (100%)
rename {extra => main}/coreutils/APKBUILD (100%)
rename {extra => main}/coreutils/coreutils.post-deinstall (100%)
rename {extra => main}/coreutils/coreutils.post-upgrade (100%)
rename {extra => main}/cpufreqd/APKBUILD (100%)
rename {extra => main}/cpufreqd/cpufreqd.initd (100%)
rename {extra => main}/cpufrequtils/APKBUILD (100%)
rename {extra => main}/cpufrequtils/cpufrequtils-005-build.patch (100%)
rename {extra => main}/cpufrequtils/cpufrequtils-005-nls.patch (100%)
rename {extra => main}/cpufrequtils/cpufrequtils.confd (100%)
rename {extra => main}/cpufrequtils/cpufrequtils.initd (100%)
rename {extra => main}/cracklib-words/APKBUILD (100%)
rename {extra => main}/cracklib/APKBUILD (100%)
rename {extra => main}/ctags/APKBUILD (100%)
rename {extra => main}/cutter/APKBUILD (100%)
rename {extra => main}/cvs/APKBUILD (100%)
rename {extra => main}/cyrus-sasl/APKBUILD (100%)
rename {extra => main}/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch (100%)
rename {extra => main}/cyrus-sasl/db-4.7.patch (100%)
rename {extra => main}/cyrus-sasl/saslauthd.initd (100%)
rename {extra => main}/dahdi-linux-grsec/APKBUILD (100%)
rename {extra => main}/dahdi-linux-grsec/dahdi-bri_dchan.patch (100%)
rename {extra => main}/dahdi-linux-grsec/dahdi-depmod.patch (100%)
rename {extra => main}/dahdi-linux-grsec/dahdi-linux-2.2.0-hfc-4s.patch (100%)
rename {extra => main}/dahdi-linux-grsec/dahdi-zaphfc.patch (100%)
rename {extra => main}/dahdi-linux-grsec/zaphfc-dahdi-flortz.diff (100%)
rename {extra => main}/dahdi-linux/APKBUILD (100%)
rename {extra => main}/dahdi-tools/APKBUILD (100%)
rename {extra => main}/dahdi-tools/dahdi-tools.initd (100%)
rename {extra => main}/dansguardian/APKBUILD (100%)
rename {extra => main}/dansguardian/dansguardian.initd (100%)
rename {extra => main}/dansguardian/dansguardian.pre-install (100%)
rename {extra => main}/db/APKBUILD (100%)
rename {extra => main}/db/patch.4.7.25.1 (100%)
rename {extra => main}/db/patch.4.7.25.2 (100%)
rename {extra => main}/db/patch.4.7.25.3 (100%)
rename {extra => main}/db/patch.4.7.25.4 (100%)
rename {extra => main}/dhcp/APKBUILD (100%)
rename {extra => main}/dhcp/dhcp.post-upgrade (100%)
rename {extra => main}/dhcp/dhcp.pre-upgrade (100%)
rename {extra => main}/dhcp/dhcpd.confd (100%)
rename {extra => main}/dhcp/dhcpd.initd (100%)
rename {extra => main}/dhcpcd/APKBUILD (100%)
rename {extra => main}/dialog/APKBUILD (100%)
rename {extra => main}/diffutils/APKBUILD (100%)
rename {extra => main}/diffutils/diffutils.post-deinstall (100%)
rename {extra => main}/dircproxy/1.0.5-CVE-2007-5226.patch (100%)
rename {extra => main}/dircproxy/1.1.0-less-lag-on-attach.patch (100%)
rename {extra => main}/dircproxy/APKBUILD (100%)
rename {extra => main}/dircproxy/dircproxy-gcc4.patch (100%)
rename {extra => main}/djbdns/1.05-errno.patch (100%)
rename {extra => main}/djbdns/1.05-response.patch (100%)
rename {extra => main}/djbdns/APKBUILD (100%)
rename {extra => main}/djbdns/dnscache.confd (100%)
rename {extra => main}/djbdns/dnscache.initd (100%)
rename {extra => main}/djbdns/dnscache.pre-install (100%)
rename {extra => main}/djbdns/dnsroots.patch (100%)
rename {extra => main}/djbdns/dnstracesort.patch (100%)
rename {extra => main}/djbdns/headtail.patch (100%)
rename {extra => main}/djbdns/tinydns.confd (100%)
rename {extra => main}/djbdns/tinydns.initd (100%)
rename {extra => main}/djbdns/tinydns.pre-install (100%)
rename {extra => main}/dnsmasq/APKBUILD (100%)
rename {extra => main}/dnsmasq/dnsmasq.confd (100%)
rename {extra => main}/dnsmasq/dnsmasq.initd (100%)
rename {extra => main}/dovecot/APKBUILD (100%)
rename {extra => main}/dovecot/dovecot.initd (100%)
rename {extra => main}/dovecot/dovecot.pre-install (100%)
rename {extra => main}/dropbear/APKBUILD (100%)
rename {extra => main}/dropbear/dropbear.confd (100%)
rename {extra => main}/dropbear/dropbear.initd (100%)
rename {extra => main}/dtach/APKBUILD (100%)
rename {extra => main}/eggdrop/APKBUILD (100%)
rename {extra => main}/eggdrop/eggdrop-installer (100%)
rename {extra => main}/eggdrop/eggdrop.post-install (100%)
rename {extra => main}/eggdrop/gseen.mod.patch (100%)
rename {extra => main}/eggdrop/logs2html.mod.patch (100%)
rename {extra => main}/email/APKBUILD (100%)
rename {extra => main}/email/email-3.1.0-doc.patch (100%)
rename {extra => main}/email/email-3.1.0-ldflags.patch (100%)
rename {extra => main}/espeak/APKBUILD (100%)
rename {extra => main}/espeak/espeak-1.40.02-uclibc++.patch (100%)
rename {extra => main}/ethtool/APKBUILD (100%)
rename {extra => main}/faac/APKBUILD (100%)
rename {extra => main}/faad2/APKBUILD (100%)
rename {extra => main}/fcgi/10-fcgi-2.4.0-Makefile.patch (100%)
rename {extra => main}/fcgi/20-fcgi-2.4.0-clientdata-pointer.patch (100%)
rename {extra => main}/fcgi/30-fcgi-2.4.0-html-updates.patch (100%)
rename {extra => main}/fcgi/APKBUILD (100%)
rename {extra => main}/fetchmail/APKBUILD (100%)
rename {extra => main}/fetchmail/fetchmail.initd (100%)
rename {extra => main}/fetchmail/fetchmail.post-install (100%)
rename {extra => main}/fetchmail/fetchmail.pre-install (100%)
rename {extra => main}/flac/APKBUILD (100%)
rename {extra => main}/fping/APKBUILD (100%)
rename {extra => main}/freetds/APKBUILD (100%)
rename {extra => main}/freetype/10-bytecode.patch (100%)
rename {extra => main}/freetype/20-enable-spr.patch (100%)
rename {extra => main}/freetype/30-enable-valid.patch (100%)
rename {extra => main}/freetype/40-memcpy-fix.patch (100%)
rename {extra => main}/freetype/APKBUILD (100%)
rename {extra => main}/gawk/APKBUILD (100%)
rename {extra => main}/gawk/gawk.post-deinstall (100%)
rename {extra => main}/gd/APKBUILD (100%)
rename {extra => main}/gdb/50_all_gdb-pie-1.patch (100%)
rename {extra => main}/gdb/50_all_gdb-pie-2.patch (100%)
rename {extra => main}/gdb/APKBUILD (100%)
rename {extra => main}/gdbm/10-gdbm-1.8.3-fix-install-ownership.patch (100%)
rename {extra => main}/gdbm/20-gdbm-1.8.3-compat-linking.patch (100%)
rename {extra => main}/gdbm/30-gdbm-1.8.3-build.patch (100%)
rename {extra => main}/gdbm/APKBUILD (100%)
rename {extra => main}/gettext/APKBUILD (100%)
rename {extra => main}/ghostscript/APKBUILD (100%)
rename {extra => main}/glib/APKBUILD (100%)
rename {extra => main}/gnats/APKBUILD (100%)
rename {extra => main}/gnats/gnats.pre-install (100%)
rename {extra => main}/gnupg/APKBUILD (100%)
rename {extra => main}/gnutls/APKBUILD (100%)
rename {extra => main}/gperf/APKBUILD (100%)
rename {extra => main}/grep/APKBUILD (100%)
rename {extra => main}/grep/grep.post-deinstall (100%)
rename {extra => main}/gross/APKBUILD (100%)
rename {extra => main}/gross/gross-1.0.1-configure.ac.patch (100%)
rename {extra => main}/gross/gross-1.0.1-default-conf.patch (100%)
rename {extra => main}/gross/gross-1.0.1-user.patch (100%)
rename {extra => main}/gross/gross.post-install (100%)
rename {extra => main}/gross/gross.post-upgrade (100%)
rename {extra => main}/gross/gross.pre-install (100%)
rename {extra => main}/gross/gross.pre-upgrade (100%)
rename {extra => main}/gross/grossd.confd (100%)
rename {extra => main}/gross/grossd.initd (100%)
rename {extra => main}/gzip/APKBUILD (100%)
rename {extra => main}/gzip/gzip.post-deinstall (100%)
rename {extra => main}/haserl/APKBUILD (100%)
rename {extra => main}/heimdal/001_all_heimdal-no_libedit.patch (100%)
rename {extra => main}/heimdal/002_all_heimdal-fPIC.patch (100%)
rename {extra => main}/heimdal/003_all_heimdal-rxapps.patch (100%)
rename {extra => main}/heimdal/005_all_heimdal-suid_fix.patch (100%)
rename {extra => main}/heimdal/013_all_heimdal-pthread-lib.patch (100%)
rename {extra => main}/heimdal/014_all_heimdal-path.patch (100%)
rename {extra => main}/heimdal/022_all_heimdal-as-needed.patch (100%)
rename {extra => main}/heimdal/APKBUILD (100%)
rename {extra => main}/heimdal/heimdal-kadmind.init (100%)
rename {extra => main}/heimdal/heimdal-kdc.init (100%)
rename {extra => main}/heimdal/heimdal-kpasswdd.init (100%)
rename {extra => main}/heimdal/heimdal-r23235-kb5-libwind_la.patch (100%)
rename {extra => main}/heimdal/heimdal-r23238-kb5_locl_h-wind_h.patch (100%)
rename {extra => main}/heimdal/heimdal-system_sqlite.patch (100%)
rename {extra => main}/htop/APKBUILD (100%)
rename {extra => main}/hunspell/APKBUILD (100%)
rename {extra => main}/hylafax/APKBUILD (100%)
rename {extra => main}/hylafax/hylafax.post-install (100%)
rename {extra => main}/hypermail/APKBUILD (100%)
rename {extra => main}/hypermail/mdir2mbox.lua (100%)
rename {extra => main}/iaxmodem/APKBUILD (100%)
rename {extra => main}/iaxmodem/iaxmodem.confd (100%)
rename {extra => main}/iaxmodem/iaxmodem.initd (100%)
rename {extra => main}/iaxmodem/nocxx.patch (100%)
rename {extra => main}/icu/APKBUILD (100%)
rename {extra => main}/imagemagick/APKBUILD (100%)
rename {extra => main}/iproute2-qos/APKBUILD (100%)
rename {extra => main}/iproute2-qos/qos.confd (100%)
rename {extra => main}/iproute2-qos/qos.initd (100%)
rename {extra => main}/iproute2-qos/setup-qos (100%)
rename {extra => main}/ipsec-tools/00-verify-cert-leak.patch (100%)
rename {extra => main}/ipsec-tools/20-natoa-fix.patch (100%)
rename {extra => main}/ipsec-tools/30-natt-ports-cleanup.patch (100%)
rename {extra => main}/ipsec-tools/40-cmpsaddr-cleanup.patch (100%)
rename {extra => main}/ipsec-tools/50-reverse-connect.patch (100%)
rename {extra => main}/ipsec-tools/60-debug-quick.patch (100%)
rename {extra => main}/ipsec-tools/APKBUILD (100%)
rename {extra => main}/ipsec-tools/racoon.confd (100%)
rename {extra => main}/ipsec-tools/racoon.initd (100%)
rename {extra => main}/iptraf/APKBUILD (100%)
rename {extra => main}/iputils/APKBUILD (100%)
rename {extra => main}/iputils/iputils-20070202-no-open-max.patch (100%)
rename {extra => main}/iputils/iputils.post-install (100%)
rename {extra => main}/irssi/APKBUILD (100%)
rename {extra => main}/jpeg/APKBUILD (100%)
rename {extra => main}/json4lua/APKBUILD (100%)
rename {extra => main}/ksymoops/APKBUILD (100%)
rename {extra => main}/less/APKBUILD (100%)
rename {extra => main}/less/less.post-deinstall (100%)
rename {extra => main}/lftp/APKBUILD (100%)
rename {extra => main}/lha/APKBUILD (100%)
rename {extra => main}/libao/APKBUILD (100%)
rename {extra => main}/libart-lgpl/APKBUILD (100%)
rename {extra => main}/libassuan/APKBUILD (100%)
rename {extra => main}/libcap/APKBUILD (57%)
create mode 100644 main/libcap/include-order.patch
rename {extra => main}/libconfig/APKBUILD (100%)
rename {extra => main}/libexif/APKBUILD (100%)
rename {extra => main}/libgcrypt/APKBUILD (100%)
rename {extra => main}/libgcrypt/nocxx.patch (100%)
rename {extra => main}/libgpg-error/APKBUILD (100%)
rename {extra => main}/libgpg-error/nocxx.patch (100%)
rename {extra => main}/libiconv/APKBUILD (100%)
rename {extra => main}/libid3tag/APKBUILD (100%)
rename {extra => main}/libidn/APKBUILD (100%)
rename {extra => main}/libksba/APKBUILD (100%)
rename {extra => main}/libmcrypt/APKBUILD (100%)
rename {extra => main}/libnet/APKBUILD (100%)
rename {extra => main}/libnet/libnet-1.1.2.1-autotools.patch (100%)
rename {extra => main}/libnet/libnet-1.1.2.1-fix-chksum.patch (100%)
rename {extra => main}/libnetfilter_conntrack/APKBUILD (100%)
rename {extra => main}/libnfnetlink/APKBUILD (100%)
rename {extra => main}/libogg/APKBUILD (83%)
rename {extra => main}/libogg/nocxx.patch (100%)
rename {extra => main}/libpng/APKBUILD (100%)
rename {extra => main}/libpri/APKBUILD (100%)
rename {extra => main}/libpri/libpri-1.4.9-i14292.patch (100%)
rename {extra => main}/libpri/libpri-cflags.patch (100%)
rename {extra => main}/libsamplerate/APKBUILD (100%)
rename {extra => main}/libsndfile/APKBUILD (100%)
rename {extra => main}/libtasn1/APKBUILD (100%)
rename {extra => main}/libtheora/APKBUILD (100%)
rename {extra => main}/libusb-compat/APKBUILD (100%)
rename {extra => main}/libusb/APKBUILD (100%)
rename {extra => main}/libvorbis/APKBUILD (100%)
rename {extra => main}/libxml2/APKBUILD (100%)
rename {extra => main}/libxml2/nocxx.patch (100%)
rename {extra => main}/libxslt/APKBUILD (100%)
rename {extra => main}/lighttpd/APKBUILD (100%)
rename {extra => main}/lighttpd/lighttpd.conf (100%)
rename {extra => main}/lighttpd/lighttpd.confd (100%)
rename {extra => main}/lighttpd/lighttpd.initd (100%)
rename {extra => main}/lighttpd/lighttpd.logrotate (100%)
rename {extra => main}/lighttpd/lighttpd.post-install (100%)
rename {extra => main}/lighttpd/lighttpd.pre-install (100%)
rename {extra => main}/lighttpd/mime-types.conf (100%)
rename {extra => main}/lighttpd/mod_cgi.conf (100%)
rename {extra => main}/lighttpd/mod_fastcgi.conf (100%)
rename {extra => main}/lighttpd/spawn-fcgi.confd (100%)
rename {extra => main}/lighttpd/spawn-fcgi.initd (100%)
rename {extra => main}/links/APKBUILD (100%)
rename {extra => main}/lm_sensors/APKBUILD (100%)
rename {extra => main}/lm_sensors/fancontrol.initd (100%)
rename {extra => main}/lm_sensors/lm_sensors-3.1.0-sensors-detect-alpine.patch (100%)
rename {extra => main}/lm_sensors/lm_sensors.initd (100%)
rename {extra => main}/lm_sensors/sensord.confd (100%)
rename {extra => main}/lm_sensors/sensord.initd (100%)
rename {extra => main}/lm_sensors/sensors.install (100%)
rename {extra => main}/logrotate/APKBUILD (100%)
rename {extra => main}/lpc/APKBUILD (100%)
rename {extra => main}/lua/APKBUILD (100%)
rename {extra => main}/lua/lua-5.1-make.patch (100%)
rename {extra => main}/lua/lua-5.1-module_paths.patch (100%)
rename {extra => main}/luaposix/APKBUILD (100%)
rename {extra => main}/luasql-postgres/APKBUILD (100%)
rename {extra => main}/luasql-postgres/config.new (100%)
rename {extra => main}/lzo/APKBUILD (100%)
rename {extra => main}/man-pages/APKBUILD (100%)
rename {extra => main}/man/APKBUILD (100%)
rename {extra => main}/man/man-troff.patch (100%)
rename {extra => main}/man/whatis.periodic.daily (100%)
rename {extra => main}/md5/APKBUILD (100%)
rename {extra => main}/mini_httpd/APKBUILD (100%)
rename {extra => main}/mini_httpd/mini_httpd.conf.sample (100%)
rename {extra => main}/mini_httpd/mini_httpd.initd (100%)
rename {extra => main}/mlmmj/APKBUILD (100%)
rename {extra => main}/mpg123/APKBUILD (100%)
rename {extra => main}/mysql/APKBUILD (100%)
rename {extra => main}/mysql/mysql.initd (100%)
rename {extra => main}/mysql/mysql.mycnf (100%)
rename {extra => main}/nano/APKBUILD (100%)
rename {extra => main}/ncftp/APKBUILD (100%)
rename {extra => main}/ncftp/ncftp.post-install (100%)
rename {extra => main}/neon/APKBUILD (100%)
rename {extra => main}/net-snmp/APKBUILD (98%)
rename {extra => main}/net-snmp/snmpd.confd (100%)
rename {extra => main}/net-snmp/snmpd.initd (100%)
rename {extra => main}/net-snmp/snmptrapd.confd (100%)
rename {extra => main}/net-snmp/snmptrapd.initd (100%)
rename {extra => main}/newt/APKBUILD (100%)
rename {extra => main}/newt/newt-0.52.7-notcl.patch (100%)
rename {extra => main}/nfs-utils/APKBUILD (100%)
rename {extra => main}/nfs-utils/nfs-utils-mtab-sym.patch (100%)
rename {extra => main}/nfs-utils/nfs-utils-no-exec.patch (100%)
rename {extra => main}/nfs-utils/nfs.confd (100%)
rename {extra => main}/nfs-utils/nfs.exports (100%)
rename {extra => main}/nfs-utils/nfs.initd (100%)
rename {extra => main}/ngircd/APKBUILD (100%)
rename {extra => main}/ngircd/ngircd.initd (100%)
rename {extra => main}/ngircd/ngircd.pre-install (100%)
rename {extra => main}/nmap/APKBUILD (100%)
rename {extra => main}/nmap/nmap-4.53-uclibc++-output.cc.patch (100%)
rename {extra => main}/ntfs-3g/APKBUILD (100%)
rename {extra => main}/ntfs-3g/nocxx.patch (100%)
rename {extra => main}/oidentd/APKBUILD (100%)
rename {extra => main}/oidentd/oidentd.conf (100%)
rename {extra => main}/oidentd/oidentd.confd (100%)
rename {extra => main}/oidentd/oidentd.initd (100%)
rename {extra => main}/openldap/APKBUILD (100%)
rename {extra => main}/openldap/openldap-2.4-ppolicy.patch (100%)
rename {extra => main}/openldap/openldap-2.4.11-libldap_r.patch (100%)
rename {extra => main}/openldap/openldap.post-install (100%)
rename {extra => main}/openldap/openldap.pre-install (100%)
rename {extra => main}/openldap/slapd.confd (100%)
rename {extra => main}/openldap/slapd.initd (100%)
rename {extra => main}/openldap/slurpd.initd (100%)
rename {extra => main}/opennhrp/APKBUILD (100%)
rename {extra => main}/opennhrp/opennhrp-0.9.2-fix-false-assert.patch (100%)
rename {extra => main}/opennhrp/opennhrp-0.9.3-peer-up-bgp.patch (100%)
rename {extra => main}/opennhrp/opennhrp.confd (100%)
rename {extra => main}/opennhrp/opennhrp.initd (100%)
rename {extra => main}/openvpn/APKBUILD (100%)
rename {extra => main}/openvpn/openvpn-2.0.9-persistent.patch (100%)
rename {extra => main}/openvpn/openvpn.initd (100%)
rename {extra => main}/p7zip/APKBUILD (100%)
rename {extra => main}/p7zip/p7zip-cc-cxx.patch (100%)
rename {extra => main}/pciutils/APKBUILD (100%)
rename {extra => main}/pcmciautils/APKBUILD (100%)
rename {extra => main}/pcre/APKBUILD (100%)
rename {extra => main}/perl-archive-zip/APKBUILD (100%)
rename {extra => main}/perl-convert-binhex/APKBUILD (100%)
rename {extra => main}/perl-convert-tnef/APKBUILD (100%)
rename {extra => main}/perl-convert-uulib/APKBUILD (100%)
rename {extra => main}/perl-crypt-openssl-random/APKBUILD (100%)
rename {extra => main}/perl-crypt-openssl-rsa/APKBUILD (100%)
rename {extra => main}/perl-db/APKBUILD (100%)
rename {extra => main}/perl-db_file/APKBUILD (100%)
rename {extra => main}/perl-digest-sha1/APKBUILD (100%)
rename {extra => main}/perl-getopt-long/APKBUILD (100%)
rename {extra => main}/perl-html-parser/APKBUILD (100%)
rename {extra => main}/perl-inline/APKBUILD (100%)
rename {extra => main}/perl-io-stringy/APKBUILD (100%)
rename {extra => main}/perl-mail-clamav/APKBUILD (100%)
rename {extra => main}/perl-mail-dkim/APKBUILD (100%)
rename {extra => main}/perl-mail-domainkeys/APKBUILD (100%)
rename {extra => main}/perl-mail-spamassassin/APKBUILD (100%)
rename {extra => main}/perl-mail-spf/APKBUILD (100%)
rename {extra => main}/perl-mail-tools/APKBUILD (100%)
rename {extra => main}/perl-mime-tools/APKBUILD (100%)
rename {extra => main}/perl-net-dns/APKBUILD (100%)
rename {extra => main}/perl-net-ip/APKBUILD (100%)
rename {extra => main}/perl-net-server/APKBUILD (100%)
rename {extra => main}/perl-parse-recdescent/APKBUILD (100%)
rename {extra => main}/perl-test-pod/APKBUILD (100%)
rename {extra => main}/perl-time-date/APKBUILD (100%)
rename {extra => main}/perl-unix-syslog/APKBUILD (100%)
rename {extra => main}/perl-uri-escape/APKBUILD (100%)
rename {extra => main}/perl-uri/APKBUILD (100%)
rename {extra => main}/perl-xml-parser/APKBUILD (100%)
rename {extra => main}/perl-xml-simple/APKBUILD (100%)
rename {extra => main}/pgcluster/APKBUILD (100%)
rename {extra => main}/pgcluster/pgcluster.confd (100%)
rename {extra => main}/pgcluster/pgcluster.initd (100%)
rename {extra => main}/pgpool/APKBUILD (100%)
rename {extra => main}/pgpool/pgpool.initd (100%)
rename {extra => main}/php-apc/APKBUILD (100%)
rename {extra => main}/php-apc/apc.ini (100%)
rename {extra => main}/php-fileinfo/APKBUILD (100%)
rename {extra => main}/php-fileinfo/magic.patch (100%)
rename {extra => main}/php/APKBUILD (100%)
rename {extra => main}/pinentry/APKBUILD (100%)
rename {extra => main}/pingu/APKBUILD (100%)
rename {extra => main}/pingu/pingu.initd (100%)
rename {extra => main}/portmap/APKBUILD (100%)
rename {extra => main}/portmap/portmap-6.0-tcpd.patch (100%)
rename {extra => main}/portmap/portmap.confd (100%)
rename {extra => main}/portmap/portmap.initd (100%)
rename {extra => main}/portmap/portmap.pre-install (100%)
rename {extra => main}/postfix/APKBUILD (100%)
rename {extra => main}/postfix/dynamicmaps.cf (100%)
rename {extra => main}/postfix/postfix-2.6.1-dynamicmaps.patch (100%)
rename {extra => main}/postfix/postfix-ldap.post-install (100%)
rename {extra => main}/postfix/postfix-mysql.post-install (100%)
rename {extra => main}/postfix/postfix-pcre.post-install (100%)
rename {extra => main}/postfix/postfix-pgsql.post-install (100%)
rename {extra => main}/postfix/postfix.initd (100%)
rename {extra => main}/postfix/postfix.post-install (100%)
rename {extra => main}/postfix/postfix.pre-install (100%)
rename {extra => main}/postgresql/APKBUILD (100%)
rename {extra => main}/postgresql/postgresql.confd (100%)
rename {extra => main}/postgresql/postgresql.initd (100%)
rename {extra => main}/pth/APKBUILD (100%)
rename {extra => main}/pth/pth-2.0.5-parallelfix.patch (100%)
rename {extra => main}/pth/pth-2.0.6-ldflags.patch (100%)
rename {extra => main}/pth/pth-2.0.6-sigstack.patch (100%)
rename {extra => main}/python/APKBUILD (100%)
rename {extra => main}/python/python-2.6-internal-expat.patch (100%)
rename {extra => main}/quagga/APKBUILD (100%)
rename {extra => main}/quagga/bgpd.initd (100%)
rename {extra => main}/quagga/ospf6d.initd (100%)
rename {extra => main}/quagga/ospfd.initd (100%)
rename {extra => main}/quagga/quagga-0.99.11-del-routes.patch (100%)
rename {extra => main}/quagga/quagga-0.99.11-fd-leak.patch (100%)
rename {extra => main}/quagga/quagga-0.99.11-ipv6-only.patch (100%)
rename {extra => main}/quagga/quagga-0.99.11-link-libcap.patch (100%)
rename {extra => main}/quagga/quagga-0.99.11-zombie.patch (100%)
rename {extra => main}/quagga/quagga.post-install (100%)
rename {extra => main}/quagga/quagga.pre-install (100%)
rename {extra => main}/quagga/ripd.initd (100%)
rename {extra => main}/quagga/ripngd.initd (100%)
rename {extra => main}/quagga/zebra.confd (100%)
rename {extra => main}/quagga/zebra.initd (100%)
rename {extra => main}/razor/APKBUILD (100%)
rename {extra => main}/roundcubemail/APKBUILD (100%)
rename {extra => main}/rrdtool/APKBUILD (100%)
rename {extra => main}/rsync/APKBUILD (100%)
rename {extra => main}/rsync/rsyncd.conf (100%)
rename {extra => main}/rsync/rsyncd.confd (100%)
rename {extra => main}/rsync/rsyncd.initd (100%)
rename {extra => main}/rsync/rsyncd.logrotate (100%)
rename {extra => main}/ruby/APKBUILD (100%)
rename {extra => main}/rubygems/APKBUILD (100%)
rename {extra => main}/rubygems/rubygems-1.3.1-setup.patch (100%)
rename {extra => main}/run-parts/APKBUILD (100%)
rename {extra => main}/samba/APKBUILD (100%)
rename {extra => main}/samba/samba.confd (100%)
rename {extra => main}/samba/samba.initd (100%)
rename {extra => main}/screen/APKBUILD (100%)
rename {extra => main}/screen/screen-4.0.3.patch (100%)
rename {extra => main}/sed/APKBUILD (100%)
rename {extra => main}/sed/sed.post-deinstall (100%)
rename {extra => main}/sfic/APKBUILD (100%)
rename {extra => main}/sfic/sfic-0.1.7-signal.patch (100%)
rename {extra => main}/shorewall-common/APKBUILD (100%)
rename {extra => main}/shorewall-common/shorewall.initd (100%)
rename {extra => main}/shorewall-lite/APKBUILD (100%)
rename {extra => main}/shorewall-lite/shorewall-lite.initd (100%)
rename {extra => main}/shorewall-perl/APKBUILD (100%)
rename {extra => main}/shorewall-shell/APKBUILD (100%)
rename {extra => main}/shorewall/APKBUILD (100%)
rename {extra => main}/sic/APKBUILD (100%)
rename {extra => main}/slang/APKBUILD (100%)
rename {extra => main}/slang/slang-2.1.3-uclibc.patch (100%)
rename {extra => main}/snort/APKBUILD (100%)
rename {extra => main}/snort/nocxx.patch (100%)
rename {extra => main}/snort/snort.confd (100%)
rename {extra => main}/snort/snort.initd (100%)
rename {extra => main}/snort/snort.pre-install (100%)
rename {extra => main}/sntpc/APKBUILD (100%)
rename {extra => main}/sntpc/sntpc.confd (100%)
rename {extra => main}/sntpc/sntpc.initd (100%)
rename {extra => main}/spamassassin/APKBUILD (100%)
rename {extra => main}/spamassassin/spamd.conf (100%)
rename {extra => main}/spamassassin/spamd.init (100%)
rename {extra => main}/sqlite/APKBUILD (100%)
rename {extra => main}/sqlite/license.txt (100%)
rename {extra => main}/squid/APKBUILD (100%)
rename {extra => main}/squid/squid-2.7-gentoo.patch (100%)
rename {extra => main}/squid/squid.confd (100%)
rename {extra => main}/squid/squid.initd (100%)
rename {extra => main}/squid/squid.logrotate (100%)
rename {extra => main}/squid/squid.post-install (100%)
rename {extra => main}/ssmtp/APKBUILD (100%)
rename {extra => main}/ssmtp/CVE-2008-3962.patch (100%)
rename {extra => main}/ssmtp/generate_config.patch (100%)
rename {extra => main}/strace/APKBUILD (100%)
rename {extra => main}/subversion/APKBUILD (100%)
rename {extra => main}/subversion/subversion.pre-install (100%)
rename {extra => main}/subversion/svnserve.confd (100%)
rename {extra => main}/subversion/svnserve.initd (100%)
rename {extra => main}/sysfsutils/APKBUILD (100%)
rename {extra => main}/sysklogd/APKBUILD (100%)
rename {extra => main}/sysklogd/LICENSE (100%)
rename {extra => main}/sysklogd/sysklogd-1.4.2-caen-owl-klogd-drop-root.diff (100%)
rename {extra => main}/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-bind.diff (100%)
rename {extra => main}/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff (100%)
rename {extra => main}/sysklogd/sysklogd-1.5-build.patch (100%)
rename {extra => main}/sysklogd/sysklogd.confd (100%)
rename {extra => main}/sysklogd/sysklogd.initd (100%)
rename {extra => main}/sysklogd/sysklogd.logrotate (100%)
rename {extra => main}/sysstat/APKBUILD (100%)
rename {extra => main}/tar/APKBUILD (100%)
rename {extra => main}/tar/tar.post-deinstall (100%)
rename {extra => main}/tcl/APKBUILD (100%)
rename {extra => main}/tcpdump/APKBUILD (100%)
rename {extra => main}/tcpproxy/APKBUILD (77%)
rename {extra => main}/tcpproxy/tcpproxy.initd (100%)
rename {extra => main}/tiff/APKBUILD (100%)
rename {extra => main}/tinyproxy/APKBUILD (100%)
rename {extra => main}/tinyproxy/tinyproxy.initd (100%)
rename {extra => main}/tinyproxy/tinyproxy.install (100%)
rename {extra => main}/tmux/APKBUILD (100%)
rename {extra => main}/tmux/build.patch (100%)
rename {extra => main}/transmission/APKBUILD (100%)
rename {extra => main}/transmission/transmission-daemon.confd (100%)
rename {extra => main}/transmission/transmission-daemon.initd (100%)
rename {extra => main}/transmission/transmission.pre-install (100%)
rename {extra => main}/udev/APKBUILD (100%)
rename {extra => main}/udev/move_tmp_persistent_rules.sh (100%)
rename {extra => main}/udev/udev-mount.initd (100%)
rename {extra => main}/udev/udev-postmount.initd (100%)
rename {extra => main}/udev/udev-start.sh (100%)
rename {extra => main}/udev/udev.initd (100%)
rename {extra => main}/udev/write_root_link_rule (100%)
rename {extra => main}/uiconv/APKBUILD (100%)
rename {extra => main}/unarj/APKBUILD (100%)
rename {extra => main}/unfs3/APKBUILD (100%)
rename {extra => main}/unixodbc/APKBUILD (100%)
rename {extra => main}/unrar/APKBUILD (100%)
rename {extra => main}/usbutils/APKBUILD (100%)
rename {extra => main}/v86d/APKBUILD (100%)
rename {extra => main}/v86d/modprobe.uvesafb (100%)
rename {extra => main}/vala/APKBUILD (100%)
rename {extra => main}/valgrind/APKBUILD (100%)
rename {extra => main}/valgrind/valgrind-3.4.0-uclibc.patch (100%)
rename {extra => main}/vim/APKBUILD (100%)
rename {extra => main}/vim/vimrc (100%)
rename {extra => main}/vsftpd/APKBUILD (100%)
rename {extra => main}/vsftpd/vsftpd-enable-ssl.patch (100%)
rename {extra => main}/vsftpd/vsftpd.confd (100%)
rename {extra => main}/vsftpd/vsftpd.initd (100%)
rename {extra => main}/wget/APKBUILD (100%)
rename {extra => main}/wget/wget.post-deinstall (100%)
rename {extra => main}/xvidcore/APKBUILD (100%)
rename {extra => main}/zip/10-zip-3.0-build.patch (100%)
rename {extra => main}/zip/20-zip-3.0-exec-stack.patch (100%)
rename {extra => main}/zip/30-zip-3.0-pic.patch (100%)
rename {extra => main}/zip/APKBUILD (100%)
rename {extra => main}/zonenotify/APKBUILD (100%)
diff --git a/extra/popt/APKBUILD b/extra/popt/APKBUILD
deleted file mode 100644
index 4826bd2d2879..000000000000
--- a/extra/popt/APKBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=popt
-pkgver=1.14
-pkgrel=0
-pkgdesc="Parse Options - Command line parser"
-url="http://rpm5.org/"
-license="as-is"
-depends="uclibc"
-subpackages="$pkgname-dev $pkgname-doc"
-source="http://rpm5.org/files/popt/$pkgname-$pkgver.tar.gz"
-
-build() {
- cd "$srcdir"/$pkgname-$pkgver
- ./configure --prefix=/usr \
- --without-included-gettext \
- --disable-nls || return 1
- make || return 1
- make install DESTDIR="$pkgdir"
-}
-md5sums="4f90a07316eb825604dd10ae4f9f3f04 popt-1.14.tar.gz"
diff --git a/extra/acct/APKBUILD b/main/acct/APKBUILD
similarity index 100%
rename from extra/acct/APKBUILD
rename to main/acct/APKBUILD
diff --git a/extra/acf-alpine-baselayout/APKBUILD b/main/acf-alpine-baselayout/APKBUILD
similarity index 100%
rename from extra/acf-alpine-baselayout/APKBUILD
rename to main/acf-alpine-baselayout/APKBUILD
diff --git a/extra/acf-alpine-conf/APKBUILD b/main/acf-alpine-conf/APKBUILD
similarity index 100%
rename from extra/acf-alpine-conf/APKBUILD
rename to main/acf-alpine-conf/APKBUILD
diff --git a/extra/acf-apk-tools/APKBUILD b/main/acf-apk-tools/APKBUILD
similarity index 100%
rename from extra/acf-apk-tools/APKBUILD
rename to main/acf-apk-tools/APKBUILD
diff --git a/extra/acf-asterisk/APKBUILD b/main/acf-asterisk/APKBUILD
similarity index 100%
rename from extra/acf-asterisk/APKBUILD
rename to main/acf-asterisk/APKBUILD
diff --git a/extra/acf-chrony/APKBUILD b/main/acf-chrony/APKBUILD
similarity index 100%
rename from extra/acf-chrony/APKBUILD
rename to main/acf-chrony/APKBUILD
diff --git a/extra/acf-clamav/APKBUILD b/main/acf-clamav/APKBUILD
similarity index 100%
rename from extra/acf-clamav/APKBUILD
rename to main/acf-clamav/APKBUILD
diff --git a/extra/acf-clamsmtp/APKBUILD b/main/acf-clamsmtp/APKBUILD
similarity index 100%
rename from extra/acf-clamsmtp/APKBUILD
rename to main/acf-clamsmtp/APKBUILD
diff --git a/extra/acf-core/APKBUILD b/main/acf-core/APKBUILD
similarity index 100%
rename from extra/acf-core/APKBUILD
rename to main/acf-core/APKBUILD
diff --git a/extra/acf-dansguardian/APKBUILD b/main/acf-dansguardian/APKBUILD
similarity index 100%
rename from extra/acf-dansguardian/APKBUILD
rename to main/acf-dansguardian/APKBUILD
diff --git a/extra/acf-dhcp/APKBUILD b/main/acf-dhcp/APKBUILD
similarity index 100%
rename from extra/acf-dhcp/APKBUILD
rename to main/acf-dhcp/APKBUILD
diff --git a/extra/acf-dnscache/APKBUILD b/main/acf-dnscache/APKBUILD
similarity index 100%
rename from extra/acf-dnscache/APKBUILD
rename to main/acf-dnscache/APKBUILD
diff --git a/extra/acf-dnsmasq/APKBUILD b/main/acf-dnsmasq/APKBUILD
similarity index 100%
rename from extra/acf-dnsmasq/APKBUILD
rename to main/acf-dnsmasq/APKBUILD
diff --git a/extra/acf-dovecot/APKBUILD b/main/acf-dovecot/APKBUILD
similarity index 100%
rename from extra/acf-dovecot/APKBUILD
rename to main/acf-dovecot/APKBUILD
diff --git a/extra/acf-fetchmail/APKBUILD b/main/acf-fetchmail/APKBUILD
similarity index 100%
rename from extra/acf-fetchmail/APKBUILD
rename to main/acf-fetchmail/APKBUILD
diff --git a/extra/acf-gnats/APKBUILD b/main/acf-gnats/APKBUILD
similarity index 100%
rename from extra/acf-gnats/APKBUILD
rename to main/acf-gnats/APKBUILD
diff --git a/extra/acf-gross/APKBUILD b/main/acf-gross/APKBUILD
similarity index 100%
rename from extra/acf-gross/APKBUILD
rename to main/acf-gross/APKBUILD
diff --git a/extra/acf-ipsec-tools/APKBUILD b/main/acf-ipsec-tools/APKBUILD
similarity index 100%
rename from extra/acf-ipsec-tools/APKBUILD
rename to main/acf-ipsec-tools/APKBUILD
diff --git a/extra/acf-iptables/APKBUILD b/main/acf-iptables/APKBUILD
similarity index 100%
rename from extra/acf-iptables/APKBUILD
rename to main/acf-iptables/APKBUILD
diff --git a/extra/acf-mdadm/APKBUILD b/main/acf-mdadm/APKBUILD
similarity index 100%
rename from extra/acf-mdadm/APKBUILD
rename to main/acf-mdadm/APKBUILD
diff --git a/extra/acf-opennhrp/APKBUILD b/main/acf-opennhrp/APKBUILD
similarity index 100%
rename from extra/acf-opennhrp/APKBUILD
rename to main/acf-opennhrp/APKBUILD
diff --git a/extra/acf-openntpd/APKBUILD b/main/acf-openntpd/APKBUILD
similarity index 100%
rename from extra/acf-openntpd/APKBUILD
rename to main/acf-openntpd/APKBUILD
diff --git a/extra/acf-openssh/APKBUILD b/main/acf-openssh/APKBUILD
similarity index 100%
rename from extra/acf-openssh/APKBUILD
rename to main/acf-openssh/APKBUILD
diff --git a/extra/acf-openssl/APKBUILD b/main/acf-openssl/APKBUILD
similarity index 100%
rename from extra/acf-openssl/APKBUILD
rename to main/acf-openssl/APKBUILD
diff --git a/extra/acf-openvpn/APKBUILD b/main/acf-openvpn/APKBUILD
similarity index 100%
rename from extra/acf-openvpn/APKBUILD
rename to main/acf-openvpn/APKBUILD
diff --git a/extra/acf-pingu/APKBUILD b/main/acf-pingu/APKBUILD
similarity index 100%
rename from extra/acf-pingu/APKBUILD
rename to main/acf-pingu/APKBUILD
diff --git a/extra/acf-postfix/APKBUILD b/main/acf-postfix/APKBUILD
similarity index 100%
rename from extra/acf-postfix/APKBUILD
rename to main/acf-postfix/APKBUILD
diff --git a/extra/acf-postgresql/APKBUILD b/main/acf-postgresql/APKBUILD
similarity index 100%
rename from extra/acf-postgresql/APKBUILD
rename to main/acf-postgresql/APKBUILD
diff --git a/extra/acf-ppp/APKBUILD b/main/acf-ppp/APKBUILD
similarity index 100%
rename from extra/acf-ppp/APKBUILD
rename to main/acf-ppp/APKBUILD
diff --git a/extra/acf-quagga/APKBUILD b/main/acf-quagga/APKBUILD
similarity index 100%
rename from extra/acf-quagga/APKBUILD
rename to main/acf-quagga/APKBUILD
diff --git a/extra/acf-samba/APKBUILD b/main/acf-samba/APKBUILD
similarity index 100%
rename from extra/acf-samba/APKBUILD
rename to main/acf-samba/APKBUILD
diff --git a/extra/acf-shorewall/APKBUILD b/main/acf-shorewall/APKBUILD
similarity index 100%
rename from extra/acf-shorewall/APKBUILD
rename to main/acf-shorewall/APKBUILD
diff --git a/extra/acf-skins/APKBUILD b/main/acf-skins/APKBUILD
similarity index 100%
rename from extra/acf-skins/APKBUILD
rename to main/acf-skins/APKBUILD
diff --git a/extra/acf-snort/APKBUILD b/main/acf-snort/APKBUILD
similarity index 100%
rename from extra/acf-snort/APKBUILD
rename to main/acf-snort/APKBUILD
diff --git a/extra/acf-squid/APKBUILD b/main/acf-squid/APKBUILD
similarity index 100%
rename from extra/acf-squid/APKBUILD
rename to main/acf-squid/APKBUILD
diff --git a/extra/acf-tcpproxy/APKBUILD b/main/acf-tcpproxy/APKBUILD
similarity index 100%
rename from extra/acf-tcpproxy/APKBUILD
rename to main/acf-tcpproxy/APKBUILD
diff --git a/extra/acf-tinydns/APKBUILD b/main/acf-tinydns/APKBUILD
similarity index 100%
rename from extra/acf-tinydns/APKBUILD
rename to main/acf-tinydns/APKBUILD
diff --git a/extra/acf-weblog/APKBUILD b/main/acf-weblog/APKBUILD
similarity index 100%
rename from extra/acf-weblog/APKBUILD
rename to main/acf-weblog/APKBUILD
diff --git a/extra/alsa-lib/APKBUILD b/main/alsa-lib/APKBUILD
similarity index 100%
rename from extra/alsa-lib/APKBUILD
rename to main/alsa-lib/APKBUILD
diff --git a/extra/alsa-lib/nocxx.patch b/main/alsa-lib/nocxx.patch
similarity index 100%
rename from extra/alsa-lib/nocxx.patch
rename to main/alsa-lib/nocxx.patch
diff --git a/extra/amavisd-new/APKBUILD b/main/amavisd-new/APKBUILD
similarity index 100%
rename from extra/amavisd-new/APKBUILD
rename to main/amavisd-new/APKBUILD
diff --git a/extra/amavisd-new/amavisd-new.post-install b/main/amavisd-new/amavisd-new.post-install
similarity index 100%
rename from extra/amavisd-new/amavisd-new.post-install
rename to main/amavisd-new/amavisd-new.post-install
diff --git a/extra/amavisd-new/amavisd.init b/main/amavisd-new/amavisd.init
similarity index 100%
rename from extra/amavisd-new/amavisd.init
rename to main/amavisd-new/amavisd.init
diff --git a/extra/apr-util/APKBUILD b/main/apr-util/APKBUILD
similarity index 100%
rename from extra/apr-util/APKBUILD
rename to main/apr-util/APKBUILD
diff --git a/extra/apr/APKBUILD b/main/apr/APKBUILD
similarity index 100%
rename from extra/apr/APKBUILD
rename to main/apr/APKBUILD
diff --git a/extra/arpwatch/APKBUILD b/main/arpwatch/APKBUILD
similarity index 100%
rename from extra/arpwatch/APKBUILD
rename to main/arpwatch/APKBUILD
diff --git a/extra/arpwatch/arpwatch.confd b/main/arpwatch/arpwatch.confd
similarity index 100%
rename from extra/arpwatch/arpwatch.confd
rename to main/arpwatch/arpwatch.confd
diff --git a/extra/arpwatch/arpwatch.initd b/main/arpwatch/arpwatch.initd
similarity index 100%
rename from extra/arpwatch/arpwatch.initd
rename to main/arpwatch/arpwatch.initd
diff --git a/extra/aspell/APKBUILD b/main/aspell/APKBUILD
similarity index 100%
rename from extra/aspell/APKBUILD
rename to main/aspell/APKBUILD
diff --git a/extra/aspell/libmath.patch b/main/aspell/libmath.patch
similarity index 100%
rename from extra/aspell/libmath.patch
rename to main/aspell/libmath.patch
diff --git a/extra/asterisk/100-uclibc-daemon.patch b/main/asterisk/100-uclibc-daemon.patch
similarity index 100%
rename from extra/asterisk/100-uclibc-daemon.patch
rename to main/asterisk/100-uclibc-daemon.patch
diff --git a/extra/asterisk/101-caps-uclibc.patch b/main/asterisk/101-caps-uclibc.patch
similarity index 100%
rename from extra/asterisk/101-caps-uclibc.patch
rename to main/asterisk/101-caps-uclibc.patch
diff --git a/extra/asterisk/102-gsm-pic.patch b/main/asterisk/102-gsm-pic.patch
similarity index 100%
rename from extra/asterisk/102-gsm-pic.patch
rename to main/asterisk/102-gsm-pic.patch
diff --git a/extra/asterisk/103-rundir.patch b/main/asterisk/103-rundir.patch
similarity index 100%
rename from extra/asterisk/103-rundir.patch
rename to main/asterisk/103-rundir.patch
diff --git a/extra/asterisk/APKBUILD b/main/asterisk/APKBUILD
similarity index 100%
rename from extra/asterisk/APKBUILD
rename to main/asterisk/APKBUILD
diff --git a/extra/asterisk/asterisk.confd b/main/asterisk/asterisk.confd
similarity index 100%
rename from extra/asterisk/asterisk.confd
rename to main/asterisk/asterisk.confd
diff --git a/extra/asterisk/asterisk.initd b/main/asterisk/asterisk.initd
similarity index 100%
rename from extra/asterisk/asterisk.initd
rename to main/asterisk/asterisk.initd
diff --git a/extra/asterisk/asterisk.post-install b/main/asterisk/asterisk.post-install
similarity index 100%
rename from extra/asterisk/asterisk.post-install
rename to main/asterisk/asterisk.post-install
diff --git a/extra/asterisk/asterisk.pre-install b/main/asterisk/asterisk.pre-install
similarity index 100%
rename from extra/asterisk/asterisk.pre-install
rename to main/asterisk/asterisk.pre-install
diff --git a/extra/aumix/APKBUILD b/main/aumix/APKBUILD
similarity index 100%
rename from extra/aumix/APKBUILD
rename to main/aumix/APKBUILD
diff --git a/extra/aumix/aumix-2.8-mute.patch b/main/aumix/aumix-2.8-mute.patch
similarity index 100%
rename from extra/aumix/aumix-2.8-mute.patch
rename to main/aumix/aumix-2.8-mute.patch
diff --git a/extra/aumix/aumix-2.8-nohome.patch b/main/aumix/aumix-2.8-nohome.patch
similarity index 100%
rename from extra/aumix/aumix-2.8-nohome.patch
rename to main/aumix/aumix-2.8-nohome.patch
diff --git a/extra/aumix/aumix-2.8-save_load.patch b/main/aumix/aumix-2.8-save_load.patch
similarity index 100%
rename from extra/aumix/aumix-2.8-save_load.patch
rename to main/aumix/aumix-2.8-save_load.patch
diff --git a/extra/aumix/aumix.initd b/main/aumix/aumix.initd
similarity index 100%
rename from extra/aumix/aumix.initd
rename to main/aumix/aumix.initd
diff --git a/extra/b43-fwcutter/APKBUILD b/main/b43-fwcutter/APKBUILD
similarity index 100%
rename from extra/b43-fwcutter/APKBUILD
rename to main/b43-fwcutter/APKBUILD
diff --git a/extra/bc/APKBUILD b/main/bc/APKBUILD
similarity index 100%
rename from extra/bc/APKBUILD
rename to main/bc/APKBUILD
diff --git a/extra/beep/APKBUILD b/main/beep/APKBUILD
similarity index 100%
rename from extra/beep/APKBUILD
rename to main/beep/APKBUILD
diff --git a/extra/beep/beep-1.2.2-nosuid.patch b/main/beep/beep-1.2.2-nosuid.patch
similarity index 100%
rename from extra/beep/beep-1.2.2-nosuid.patch
rename to main/beep/beep-1.2.2-nosuid.patch
diff --git a/extra/bind/APKBUILD b/main/bind/APKBUILD
similarity index 100%
rename from extra/bind/APKBUILD
rename to main/bind/APKBUILD
diff --git a/extra/bind/bind.127.zone b/main/bind/bind.127.zone
similarity index 100%
rename from extra/bind/bind.127.zone
rename to main/bind/bind.127.zone
diff --git a/extra/bind/bind.conf b/main/bind/bind.conf
similarity index 100%
rename from extra/bind/bind.conf
rename to main/bind/bind.conf
diff --git a/extra/bind/bind.confd b/main/bind/bind.confd
similarity index 100%
rename from extra/bind/bind.confd
rename to main/bind/bind.confd
diff --git a/extra/bind/bind.initd b/main/bind/bind.initd
similarity index 100%
rename from extra/bind/bind.initd
rename to main/bind/bind.initd
diff --git a/extra/bind/bind.localhost.zone b/main/bind/bind.localhost.zone
similarity index 100%
rename from extra/bind/bind.localhost.zone
rename to main/bind/bind.localhost.zone
diff --git a/extra/bind/bind.named.ca b/main/bind/bind.named.ca
similarity index 100%
rename from extra/bind/bind.named.ca
rename to main/bind/bind.named.ca
diff --git a/extra/bind/bind.post-install b/main/bind/bind.post-install
similarity index 100%
rename from extra/bind/bind.post-install
rename to main/bind/bind.post-install
diff --git a/extra/bind/bind.pre-install b/main/bind/bind.pre-install
similarity index 100%
rename from extra/bind/bind.pre-install
rename to main/bind/bind.pre-install
diff --git a/extra/bind/bind.so_bsdcompat.patch b/main/bind/bind.so_bsdcompat.patch
similarity index 100%
rename from extra/bind/bind.so_bsdcompat.patch
rename to main/bind/bind.so_bsdcompat.patch
diff --git a/extra/bitlib/APKBUILD b/main/bitlib/APKBUILD
similarity index 100%
rename from extra/bitlib/APKBUILD
rename to main/bitlib/APKBUILD
diff --git a/extra/bridge-utils/APKBUILD b/main/bridge-utils/APKBUILD
similarity index 100%
rename from extra/bridge-utils/APKBUILD
rename to main/bridge-utils/APKBUILD
diff --git a/extra/bzip2/APKBUILD b/main/bzip2/APKBUILD
similarity index 100%
rename from extra/bzip2/APKBUILD
rename to main/bzip2/APKBUILD
diff --git a/extra/bzip2/bzip2-1.0.4-POSIX-shell.patch b/main/bzip2/bzip2-1.0.4-POSIX-shell.patch
similarity index 100%
rename from extra/bzip2/bzip2-1.0.4-POSIX-shell.patch
rename to main/bzip2/bzip2-1.0.4-POSIX-shell.patch
diff --git a/extra/bzip2/bzip2-1.0.4-makefile-CFLAGS.patch b/main/bzip2/bzip2-1.0.4-makefile-CFLAGS.patch
similarity index 100%
rename from extra/bzip2/bzip2-1.0.4-makefile-CFLAGS.patch
rename to main/bzip2/bzip2-1.0.4-makefile-CFLAGS.patch
diff --git a/extra/bzip2/bzip2-1.0.4-man-links.patch b/main/bzip2/bzip2-1.0.4-man-links.patch
similarity index 100%
rename from extra/bzip2/bzip2-1.0.4-man-links.patch
rename to main/bzip2/bzip2-1.0.4-man-links.patch
diff --git a/extra/bzip2/bzip2-1.0.4-saneso.patch b/main/bzip2/bzip2-1.0.4-saneso.patch
similarity index 100%
rename from extra/bzip2/bzip2-1.0.4-saneso.patch
rename to main/bzip2/bzip2-1.0.4-saneso.patch
diff --git a/extra/bzip2/bzip2.post-deinstall b/main/bzip2/bzip2.post-deinstall
similarity index 100%
rename from extra/bzip2/bzip2.post-deinstall
rename to main/bzip2/bzip2.post-deinstall
diff --git a/extra/c-ares/APKBUILD b/main/c-ares/APKBUILD
similarity index 100%
rename from extra/c-ares/APKBUILD
rename to main/c-ares/APKBUILD
diff --git a/extra/ca-certificates/APKBUILD b/main/ca-certificates/APKBUILD
similarity index 100%
rename from extra/ca-certificates/APKBUILD
rename to main/ca-certificates/APKBUILD
diff --git a/extra/ca-certificates/ca-certificates.post-install b/main/ca-certificates/ca-certificates.post-install
similarity index 100%
rename from extra/ca-certificates/ca-certificates.post-install
rename to main/ca-certificates/ca-certificates.post-install
diff --git a/extra/ccache/APKBUILD b/main/ccache/APKBUILD
similarity index 100%
rename from extra/ccache/APKBUILD
rename to main/ccache/APKBUILD
diff --git a/extra/cdrkit/APKBUILD b/main/cdrkit/APKBUILD
similarity index 100%
rename from extra/cdrkit/APKBUILD
rename to main/cdrkit/APKBUILD
diff --git a/extra/cgit/APKBUILD b/main/cgit/APKBUILD
similarity index 100%
rename from extra/cgit/APKBUILD
rename to main/cgit/APKBUILD
diff --git a/extra/chrony/APKBUILD b/main/chrony/APKBUILD
similarity index 100%
rename from extra/chrony/APKBUILD
rename to main/chrony/APKBUILD
diff --git a/extra/chrony/chrony-1.20-chrony.conf.example-gentoo.diff b/main/chrony/chrony-1.20-chrony.conf.example-gentoo.diff
similarity index 100%
rename from extra/chrony/chrony-1.20-chrony.conf.example-gentoo.diff
rename to main/chrony/chrony-1.20-chrony.conf.example-gentoo.diff
diff --git a/extra/chrony/chrony-1.20-conf.c-gentoo.diff b/main/chrony/chrony-1.20-conf.c-gentoo.diff
similarity index 100%
rename from extra/chrony/chrony-1.20-conf.c-gentoo.diff
rename to main/chrony/chrony-1.20-conf.c-gentoo.diff
diff --git a/extra/chrony/chrony-1.21-makefile.diff b/main/chrony/chrony-1.21-makefile.diff
similarity index 100%
rename from extra/chrony/chrony-1.21-makefile.diff
rename to main/chrony/chrony-1.21-makefile.diff
diff --git a/extra/chrony/chrony-1.23-reply-ip.diff b/main/chrony/chrony-1.23-reply-ip.diff
similarity index 100%
rename from extra/chrony/chrony-1.23-reply-ip.diff
rename to main/chrony/chrony-1.23-reply-ip.diff
diff --git a/extra/chrony/chrony-1.23-sources.diff b/main/chrony/chrony-1.23-sources.diff
similarity index 100%
rename from extra/chrony/chrony-1.23-sources.diff
rename to main/chrony/chrony-1.23-sources.diff
diff --git a/extra/chrony/chrony.conf b/main/chrony/chrony.conf
similarity index 100%
rename from extra/chrony/chrony.conf
rename to main/chrony/chrony.conf
diff --git a/extra/chrony/chronyd.confd b/main/chrony/chronyd.confd
similarity index 100%
rename from extra/chrony/chronyd.confd
rename to main/chrony/chronyd.confd
diff --git a/extra/chrony/chronyd.initd b/main/chrony/chronyd.initd
similarity index 100%
rename from extra/chrony/chronyd.initd
rename to main/chrony/chronyd.initd
diff --git a/extra/cksfv/APKBUILD b/main/cksfv/APKBUILD
similarity index 100%
rename from extra/cksfv/APKBUILD
rename to main/cksfv/APKBUILD
diff --git a/extra/clamav/APKBUILD b/main/clamav/APKBUILD
similarity index 100%
rename from extra/clamav/APKBUILD
rename to main/clamav/APKBUILD
diff --git a/extra/clamav/clamav-0.95.1-nls.patch b/main/clamav/clamav-0.95.1-nls.patch
similarity index 100%
rename from extra/clamav/clamav-0.95.1-nls.patch
rename to main/clamav/clamav-0.95.1-nls.patch
diff --git a/extra/clamav/clamav.logrotate b/main/clamav/clamav.logrotate
similarity index 100%
rename from extra/clamav/clamav.logrotate
rename to main/clamav/clamav.logrotate
diff --git a/extra/clamav/clamav.post-install b/main/clamav/clamav.post-install
similarity index 100%
rename from extra/clamav/clamav.post-install
rename to main/clamav/clamav.post-install
diff --git a/extra/clamav/clamav.pre-install b/main/clamav/clamav.pre-install
similarity index 100%
rename from extra/clamav/clamav.pre-install
rename to main/clamav/clamav.pre-install
diff --git a/extra/clamav/clamav.pre-upgrade b/main/clamav/clamav.pre-upgrade
similarity index 100%
rename from extra/clamav/clamav.pre-upgrade
rename to main/clamav/clamav.pre-upgrade
diff --git a/extra/clamav/clamd.confd b/main/clamav/clamd.confd
similarity index 100%
rename from extra/clamav/clamd.confd
rename to main/clamav/clamd.confd
diff --git a/extra/clamav/clamd.initd b/main/clamav/clamd.initd
similarity index 100%
rename from extra/clamav/clamd.initd
rename to main/clamav/clamd.initd
diff --git a/extra/clamav/freshclam.confd b/main/clamav/freshclam.confd
similarity index 100%
rename from extra/clamav/freshclam.confd
rename to main/clamav/freshclam.confd
diff --git a/extra/clamav/freshclam.initd b/main/clamav/freshclam.initd
similarity index 100%
rename from extra/clamav/freshclam.initd
rename to main/clamav/freshclam.initd
diff --git a/extra/clamsmtp/0001-extra-clamsmtp-renamed-init.d-script-to-clamsmtpd.patch b/main/clamsmtp/0001-extra-clamsmtp-renamed-init.d-script-to-clamsmtpd.patch
similarity index 100%
rename from extra/clamsmtp/0001-extra-clamsmtp-renamed-init.d-script-to-clamsmtpd.patch
rename to main/clamsmtp/0001-extra-clamsmtp-renamed-init.d-script-to-clamsmtpd.patch
diff --git a/extra/clamsmtp/APKBUILD b/main/clamsmtp/APKBUILD
similarity index 100%
rename from extra/clamsmtp/APKBUILD
rename to main/clamsmtp/APKBUILD
diff --git a/extra/clamsmtp/clamsmtp.post-upgrade b/main/clamsmtp/clamsmtp.post-upgrade
similarity index 100%
rename from extra/clamsmtp/clamsmtp.post-upgrade
rename to main/clamsmtp/clamsmtp.post-upgrade
diff --git a/extra/clamsmtp/clamsmtp.pre-upgrade b/main/clamsmtp/clamsmtp.pre-upgrade
similarity index 100%
rename from extra/clamsmtp/clamsmtp.pre-upgrade
rename to main/clamsmtp/clamsmtp.pre-upgrade
diff --git a/extra/clamsmtp/clamsmtpd.confd b/main/clamsmtp/clamsmtpd.confd
similarity index 100%
rename from extra/clamsmtp/clamsmtpd.confd
rename to main/clamsmtp/clamsmtpd.confd
diff --git a/extra/clamsmtp/clamsmtpd.initd b/main/clamsmtp/clamsmtpd.initd
similarity index 100%
rename from extra/clamsmtp/clamsmtpd.initd
rename to main/clamsmtp/clamsmtpd.initd
diff --git a/extra/cmake/APKBUILD b/main/cmake/APKBUILD
similarity index 100%
rename from extra/cmake/APKBUILD
rename to main/cmake/APKBUILD
diff --git a/extra/conntrack-tools/APKBUILD b/main/conntrack-tools/APKBUILD
similarity index 100%
rename from extra/conntrack-tools/APKBUILD
rename to main/conntrack-tools/APKBUILD
diff --git a/extra/conntrack-tools/conntrackd.confd b/main/conntrack-tools/conntrackd.confd
similarity index 100%
rename from extra/conntrack-tools/conntrackd.confd
rename to main/conntrack-tools/conntrackd.confd
diff --git a/extra/conntrack-tools/conntrackd.initd b/main/conntrack-tools/conntrackd.initd
similarity index 100%
rename from extra/conntrack-tools/conntrackd.initd
rename to main/conntrack-tools/conntrackd.initd
diff --git a/extra/coreutils/APKBUILD b/main/coreutils/APKBUILD
similarity index 100%
rename from extra/coreutils/APKBUILD
rename to main/coreutils/APKBUILD
diff --git a/extra/coreutils/coreutils.post-deinstall b/main/coreutils/coreutils.post-deinstall
similarity index 100%
rename from extra/coreutils/coreutils.post-deinstall
rename to main/coreutils/coreutils.post-deinstall
diff --git a/extra/coreutils/coreutils.post-upgrade b/main/coreutils/coreutils.post-upgrade
similarity index 100%
rename from extra/coreutils/coreutils.post-upgrade
rename to main/coreutils/coreutils.post-upgrade
diff --git a/extra/cpufreqd/APKBUILD b/main/cpufreqd/APKBUILD
similarity index 100%
rename from extra/cpufreqd/APKBUILD
rename to main/cpufreqd/APKBUILD
diff --git a/extra/cpufreqd/cpufreqd.initd b/main/cpufreqd/cpufreqd.initd
similarity index 100%
rename from extra/cpufreqd/cpufreqd.initd
rename to main/cpufreqd/cpufreqd.initd
diff --git a/extra/cpufrequtils/APKBUILD b/main/cpufrequtils/APKBUILD
similarity index 100%
rename from extra/cpufrequtils/APKBUILD
rename to main/cpufrequtils/APKBUILD
diff --git a/extra/cpufrequtils/cpufrequtils-005-build.patch b/main/cpufrequtils/cpufrequtils-005-build.patch
similarity index 100%
rename from extra/cpufrequtils/cpufrequtils-005-build.patch
rename to main/cpufrequtils/cpufrequtils-005-build.patch
diff --git a/extra/cpufrequtils/cpufrequtils-005-nls.patch b/main/cpufrequtils/cpufrequtils-005-nls.patch
similarity index 100%
rename from extra/cpufrequtils/cpufrequtils-005-nls.patch
rename to main/cpufrequtils/cpufrequtils-005-nls.patch
diff --git a/extra/cpufrequtils/cpufrequtils.confd b/main/cpufrequtils/cpufrequtils.confd
similarity index 100%
rename from extra/cpufrequtils/cpufrequtils.confd
rename to main/cpufrequtils/cpufrequtils.confd
diff --git a/extra/cpufrequtils/cpufrequtils.initd b/main/cpufrequtils/cpufrequtils.initd
similarity index 100%
rename from extra/cpufrequtils/cpufrequtils.initd
rename to main/cpufrequtils/cpufrequtils.initd
diff --git a/extra/cracklib-words/APKBUILD b/main/cracklib-words/APKBUILD
similarity index 100%
rename from extra/cracklib-words/APKBUILD
rename to main/cracklib-words/APKBUILD
diff --git a/extra/cracklib/APKBUILD b/main/cracklib/APKBUILD
similarity index 100%
rename from extra/cracklib/APKBUILD
rename to main/cracklib/APKBUILD
diff --git a/extra/ctags/APKBUILD b/main/ctags/APKBUILD
similarity index 100%
rename from extra/ctags/APKBUILD
rename to main/ctags/APKBUILD
diff --git a/extra/cutter/APKBUILD b/main/cutter/APKBUILD
similarity index 100%
rename from extra/cutter/APKBUILD
rename to main/cutter/APKBUILD
diff --git a/extra/cvs/APKBUILD b/main/cvs/APKBUILD
similarity index 100%
rename from extra/cvs/APKBUILD
rename to main/cvs/APKBUILD
diff --git a/extra/cyrus-sasl/APKBUILD b/main/cyrus-sasl/APKBUILD
similarity index 100%
rename from extra/cyrus-sasl/APKBUILD
rename to main/cyrus-sasl/APKBUILD
diff --git a/extra/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch b/main/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch
similarity index 100%
rename from extra/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch
rename to main/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch
diff --git a/extra/cyrus-sasl/db-4.7.patch b/main/cyrus-sasl/db-4.7.patch
similarity index 100%
rename from extra/cyrus-sasl/db-4.7.patch
rename to main/cyrus-sasl/db-4.7.patch
diff --git a/extra/cyrus-sasl/saslauthd.initd b/main/cyrus-sasl/saslauthd.initd
similarity index 100%
rename from extra/cyrus-sasl/saslauthd.initd
rename to main/cyrus-sasl/saslauthd.initd
diff --git a/extra/dahdi-linux-grsec/APKBUILD b/main/dahdi-linux-grsec/APKBUILD
similarity index 100%
rename from extra/dahdi-linux-grsec/APKBUILD
rename to main/dahdi-linux-grsec/APKBUILD
diff --git a/extra/dahdi-linux-grsec/dahdi-bri_dchan.patch b/main/dahdi-linux-grsec/dahdi-bri_dchan.patch
similarity index 100%
rename from extra/dahdi-linux-grsec/dahdi-bri_dchan.patch
rename to main/dahdi-linux-grsec/dahdi-bri_dchan.patch
diff --git a/extra/dahdi-linux-grsec/dahdi-depmod.patch b/main/dahdi-linux-grsec/dahdi-depmod.patch
similarity index 100%
rename from extra/dahdi-linux-grsec/dahdi-depmod.patch
rename to main/dahdi-linux-grsec/dahdi-depmod.patch
diff --git a/extra/dahdi-linux-grsec/dahdi-linux-2.2.0-hfc-4s.patch b/main/dahdi-linux-grsec/dahdi-linux-2.2.0-hfc-4s.patch
similarity index 100%
rename from extra/dahdi-linux-grsec/dahdi-linux-2.2.0-hfc-4s.patch
rename to main/dahdi-linux-grsec/dahdi-linux-2.2.0-hfc-4s.patch
diff --git a/extra/dahdi-linux-grsec/dahdi-zaphfc.patch b/main/dahdi-linux-grsec/dahdi-zaphfc.patch
similarity index 100%
rename from extra/dahdi-linux-grsec/dahdi-zaphfc.patch
rename to main/dahdi-linux-grsec/dahdi-zaphfc.patch
diff --git a/extra/dahdi-linux-grsec/zaphfc-dahdi-flortz.diff b/main/dahdi-linux-grsec/zaphfc-dahdi-flortz.diff
similarity index 100%
rename from extra/dahdi-linux-grsec/zaphfc-dahdi-flortz.diff
rename to main/dahdi-linux-grsec/zaphfc-dahdi-flortz.diff
diff --git a/extra/dahdi-linux/APKBUILD b/main/dahdi-linux/APKBUILD
similarity index 100%
rename from extra/dahdi-linux/APKBUILD
rename to main/dahdi-linux/APKBUILD
diff --git a/extra/dahdi-tools/APKBUILD b/main/dahdi-tools/APKBUILD
similarity index 100%
rename from extra/dahdi-tools/APKBUILD
rename to main/dahdi-tools/APKBUILD
diff --git a/extra/dahdi-tools/dahdi-tools.initd b/main/dahdi-tools/dahdi-tools.initd
similarity index 100%
rename from extra/dahdi-tools/dahdi-tools.initd
rename to main/dahdi-tools/dahdi-tools.initd
diff --git a/extra/dansguardian/APKBUILD b/main/dansguardian/APKBUILD
similarity index 100%
rename from extra/dansguardian/APKBUILD
rename to main/dansguardian/APKBUILD
diff --git a/extra/dansguardian/dansguardian.initd b/main/dansguardian/dansguardian.initd
similarity index 100%
rename from extra/dansguardian/dansguardian.initd
rename to main/dansguardian/dansguardian.initd
diff --git a/extra/dansguardian/dansguardian.pre-install b/main/dansguardian/dansguardian.pre-install
similarity index 100%
rename from extra/dansguardian/dansguardian.pre-install
rename to main/dansguardian/dansguardian.pre-install
diff --git a/extra/db/APKBUILD b/main/db/APKBUILD
similarity index 100%
rename from extra/db/APKBUILD
rename to main/db/APKBUILD
diff --git a/extra/db/patch.4.7.25.1 b/main/db/patch.4.7.25.1
similarity index 100%
rename from extra/db/patch.4.7.25.1
rename to main/db/patch.4.7.25.1
diff --git a/extra/db/patch.4.7.25.2 b/main/db/patch.4.7.25.2
similarity index 100%
rename from extra/db/patch.4.7.25.2
rename to main/db/patch.4.7.25.2
diff --git a/extra/db/patch.4.7.25.3 b/main/db/patch.4.7.25.3
similarity index 100%
rename from extra/db/patch.4.7.25.3
rename to main/db/patch.4.7.25.3
diff --git a/extra/db/patch.4.7.25.4 b/main/db/patch.4.7.25.4
similarity index 100%
rename from extra/db/patch.4.7.25.4
rename to main/db/patch.4.7.25.4
diff --git a/extra/dhcp/APKBUILD b/main/dhcp/APKBUILD
similarity index 100%
rename from extra/dhcp/APKBUILD
rename to main/dhcp/APKBUILD
diff --git a/extra/dhcp/dhcp.post-upgrade b/main/dhcp/dhcp.post-upgrade
similarity index 100%
rename from extra/dhcp/dhcp.post-upgrade
rename to main/dhcp/dhcp.post-upgrade
diff --git a/extra/dhcp/dhcp.pre-upgrade b/main/dhcp/dhcp.pre-upgrade
similarity index 100%
rename from extra/dhcp/dhcp.pre-upgrade
rename to main/dhcp/dhcp.pre-upgrade
diff --git a/extra/dhcp/dhcpd.confd b/main/dhcp/dhcpd.confd
similarity index 100%
rename from extra/dhcp/dhcpd.confd
rename to main/dhcp/dhcpd.confd
diff --git a/extra/dhcp/dhcpd.initd b/main/dhcp/dhcpd.initd
similarity index 100%
rename from extra/dhcp/dhcpd.initd
rename to main/dhcp/dhcpd.initd
diff --git a/extra/dhcpcd/APKBUILD b/main/dhcpcd/APKBUILD
similarity index 100%
rename from extra/dhcpcd/APKBUILD
rename to main/dhcpcd/APKBUILD
diff --git a/extra/dialog/APKBUILD b/main/dialog/APKBUILD
similarity index 100%
rename from extra/dialog/APKBUILD
rename to main/dialog/APKBUILD
diff --git a/extra/diffutils/APKBUILD b/main/diffutils/APKBUILD
similarity index 100%
rename from extra/diffutils/APKBUILD
rename to main/diffutils/APKBUILD
diff --git a/extra/diffutils/diffutils.post-deinstall b/main/diffutils/diffutils.post-deinstall
similarity index 100%
rename from extra/diffutils/diffutils.post-deinstall
rename to main/diffutils/diffutils.post-deinstall
diff --git a/extra/dircproxy/1.0.5-CVE-2007-5226.patch b/main/dircproxy/1.0.5-CVE-2007-5226.patch
similarity index 100%
rename from extra/dircproxy/1.0.5-CVE-2007-5226.patch
rename to main/dircproxy/1.0.5-CVE-2007-5226.patch
diff --git a/extra/dircproxy/1.1.0-less-lag-on-attach.patch b/main/dircproxy/1.1.0-less-lag-on-attach.patch
similarity index 100%
rename from extra/dircproxy/1.1.0-less-lag-on-attach.patch
rename to main/dircproxy/1.1.0-less-lag-on-attach.patch
diff --git a/extra/dircproxy/APKBUILD b/main/dircproxy/APKBUILD
similarity index 100%
rename from extra/dircproxy/APKBUILD
rename to main/dircproxy/APKBUILD
diff --git a/extra/dircproxy/dircproxy-gcc4.patch b/main/dircproxy/dircproxy-gcc4.patch
similarity index 100%
rename from extra/dircproxy/dircproxy-gcc4.patch
rename to main/dircproxy/dircproxy-gcc4.patch
diff --git a/extra/djbdns/1.05-errno.patch b/main/djbdns/1.05-errno.patch
similarity index 100%
rename from extra/djbdns/1.05-errno.patch
rename to main/djbdns/1.05-errno.patch
diff --git a/extra/djbdns/1.05-response.patch b/main/djbdns/1.05-response.patch
similarity index 100%
rename from extra/djbdns/1.05-response.patch
rename to main/djbdns/1.05-response.patch
diff --git a/extra/djbdns/APKBUILD b/main/djbdns/APKBUILD
similarity index 100%
rename from extra/djbdns/APKBUILD
rename to main/djbdns/APKBUILD
diff --git a/extra/djbdns/dnscache.confd b/main/djbdns/dnscache.confd
similarity index 100%
rename from extra/djbdns/dnscache.confd
rename to main/djbdns/dnscache.confd
diff --git a/extra/djbdns/dnscache.initd b/main/djbdns/dnscache.initd
similarity index 100%
rename from extra/djbdns/dnscache.initd
rename to main/djbdns/dnscache.initd
diff --git a/extra/djbdns/dnscache.pre-install b/main/djbdns/dnscache.pre-install
similarity index 100%
rename from extra/djbdns/dnscache.pre-install
rename to main/djbdns/dnscache.pre-install
diff --git a/extra/djbdns/dnsroots.patch b/main/djbdns/dnsroots.patch
similarity index 100%
rename from extra/djbdns/dnsroots.patch
rename to main/djbdns/dnsroots.patch
diff --git a/extra/djbdns/dnstracesort.patch b/main/djbdns/dnstracesort.patch
similarity index 100%
rename from extra/djbdns/dnstracesort.patch
rename to main/djbdns/dnstracesort.patch
diff --git a/extra/djbdns/headtail.patch b/main/djbdns/headtail.patch
similarity index 100%
rename from extra/djbdns/headtail.patch
rename to main/djbdns/headtail.patch
diff --git a/extra/djbdns/tinydns.confd b/main/djbdns/tinydns.confd
similarity index 100%
rename from extra/djbdns/tinydns.confd
rename to main/djbdns/tinydns.confd
diff --git a/extra/djbdns/tinydns.initd b/main/djbdns/tinydns.initd
similarity index 100%
rename from extra/djbdns/tinydns.initd
rename to main/djbdns/tinydns.initd
diff --git a/extra/djbdns/tinydns.pre-install b/main/djbdns/tinydns.pre-install
similarity index 100%
rename from extra/djbdns/tinydns.pre-install
rename to main/djbdns/tinydns.pre-install
diff --git a/extra/dnsmasq/APKBUILD b/main/dnsmasq/APKBUILD
similarity index 100%
rename from extra/dnsmasq/APKBUILD
rename to main/dnsmasq/APKBUILD
diff --git a/extra/dnsmasq/dnsmasq.confd b/main/dnsmasq/dnsmasq.confd
similarity index 100%
rename from extra/dnsmasq/dnsmasq.confd
rename to main/dnsmasq/dnsmasq.confd
diff --git a/extra/dnsmasq/dnsmasq.initd b/main/dnsmasq/dnsmasq.initd
similarity index 100%
rename from extra/dnsmasq/dnsmasq.initd
rename to main/dnsmasq/dnsmasq.initd
diff --git a/extra/dovecot/APKBUILD b/main/dovecot/APKBUILD
similarity index 100%
rename from extra/dovecot/APKBUILD
rename to main/dovecot/APKBUILD
diff --git a/extra/dovecot/dovecot.initd b/main/dovecot/dovecot.initd
similarity index 100%
rename from extra/dovecot/dovecot.initd
rename to main/dovecot/dovecot.initd
diff --git a/extra/dovecot/dovecot.pre-install b/main/dovecot/dovecot.pre-install
similarity index 100%
rename from extra/dovecot/dovecot.pre-install
rename to main/dovecot/dovecot.pre-install
diff --git a/extra/dropbear/APKBUILD b/main/dropbear/APKBUILD
similarity index 100%
rename from extra/dropbear/APKBUILD
rename to main/dropbear/APKBUILD
diff --git a/extra/dropbear/dropbear.confd b/main/dropbear/dropbear.confd
similarity index 100%
rename from extra/dropbear/dropbear.confd
rename to main/dropbear/dropbear.confd
diff --git a/extra/dropbear/dropbear.initd b/main/dropbear/dropbear.initd
similarity index 100%
rename from extra/dropbear/dropbear.initd
rename to main/dropbear/dropbear.initd
diff --git a/extra/dtach/APKBUILD b/main/dtach/APKBUILD
similarity index 100%
rename from extra/dtach/APKBUILD
rename to main/dtach/APKBUILD
diff --git a/extra/eggdrop/APKBUILD b/main/eggdrop/APKBUILD
similarity index 100%
rename from extra/eggdrop/APKBUILD
rename to main/eggdrop/APKBUILD
diff --git a/extra/eggdrop/eggdrop-installer b/main/eggdrop/eggdrop-installer
similarity index 100%
rename from extra/eggdrop/eggdrop-installer
rename to main/eggdrop/eggdrop-installer
diff --git a/extra/eggdrop/eggdrop.post-install b/main/eggdrop/eggdrop.post-install
similarity index 100%
rename from extra/eggdrop/eggdrop.post-install
rename to main/eggdrop/eggdrop.post-install
diff --git a/extra/eggdrop/gseen.mod.patch b/main/eggdrop/gseen.mod.patch
similarity index 100%
rename from extra/eggdrop/gseen.mod.patch
rename to main/eggdrop/gseen.mod.patch
diff --git a/extra/eggdrop/logs2html.mod.patch b/main/eggdrop/logs2html.mod.patch
similarity index 100%
rename from extra/eggdrop/logs2html.mod.patch
rename to main/eggdrop/logs2html.mod.patch
diff --git a/extra/email/APKBUILD b/main/email/APKBUILD
similarity index 100%
rename from extra/email/APKBUILD
rename to main/email/APKBUILD
diff --git a/extra/email/email-3.1.0-doc.patch b/main/email/email-3.1.0-doc.patch
similarity index 100%
rename from extra/email/email-3.1.0-doc.patch
rename to main/email/email-3.1.0-doc.patch
diff --git a/extra/email/email-3.1.0-ldflags.patch b/main/email/email-3.1.0-ldflags.patch
similarity index 100%
rename from extra/email/email-3.1.0-ldflags.patch
rename to main/email/email-3.1.0-ldflags.patch
diff --git a/extra/espeak/APKBUILD b/main/espeak/APKBUILD
similarity index 100%
rename from extra/espeak/APKBUILD
rename to main/espeak/APKBUILD
diff --git a/extra/espeak/espeak-1.40.02-uclibc++.patch b/main/espeak/espeak-1.40.02-uclibc++.patch
similarity index 100%
rename from extra/espeak/espeak-1.40.02-uclibc++.patch
rename to main/espeak/espeak-1.40.02-uclibc++.patch
diff --git a/extra/ethtool/APKBUILD b/main/ethtool/APKBUILD
similarity index 100%
rename from extra/ethtool/APKBUILD
rename to main/ethtool/APKBUILD
diff --git a/extra/faac/APKBUILD b/main/faac/APKBUILD
similarity index 100%
rename from extra/faac/APKBUILD
rename to main/faac/APKBUILD
diff --git a/extra/faad2/APKBUILD b/main/faad2/APKBUILD
similarity index 100%
rename from extra/faad2/APKBUILD
rename to main/faad2/APKBUILD
diff --git a/extra/fcgi/10-fcgi-2.4.0-Makefile.patch b/main/fcgi/10-fcgi-2.4.0-Makefile.patch
similarity index 100%
rename from extra/fcgi/10-fcgi-2.4.0-Makefile.patch
rename to main/fcgi/10-fcgi-2.4.0-Makefile.patch
diff --git a/extra/fcgi/20-fcgi-2.4.0-clientdata-pointer.patch b/main/fcgi/20-fcgi-2.4.0-clientdata-pointer.patch
similarity index 100%
rename from extra/fcgi/20-fcgi-2.4.0-clientdata-pointer.patch
rename to main/fcgi/20-fcgi-2.4.0-clientdata-pointer.patch
diff --git a/extra/fcgi/30-fcgi-2.4.0-html-updates.patch b/main/fcgi/30-fcgi-2.4.0-html-updates.patch
similarity index 100%
rename from extra/fcgi/30-fcgi-2.4.0-html-updates.patch
rename to main/fcgi/30-fcgi-2.4.0-html-updates.patch
diff --git a/extra/fcgi/APKBUILD b/main/fcgi/APKBUILD
similarity index 100%
rename from extra/fcgi/APKBUILD
rename to main/fcgi/APKBUILD
diff --git a/extra/fetchmail/APKBUILD b/main/fetchmail/APKBUILD
similarity index 100%
rename from extra/fetchmail/APKBUILD
rename to main/fetchmail/APKBUILD
diff --git a/extra/fetchmail/fetchmail.initd b/main/fetchmail/fetchmail.initd
similarity index 100%
rename from extra/fetchmail/fetchmail.initd
rename to main/fetchmail/fetchmail.initd
diff --git a/extra/fetchmail/fetchmail.post-install b/main/fetchmail/fetchmail.post-install
similarity index 100%
rename from extra/fetchmail/fetchmail.post-install
rename to main/fetchmail/fetchmail.post-install
diff --git a/extra/fetchmail/fetchmail.pre-install b/main/fetchmail/fetchmail.pre-install
similarity index 100%
rename from extra/fetchmail/fetchmail.pre-install
rename to main/fetchmail/fetchmail.pre-install
diff --git a/extra/flac/APKBUILD b/main/flac/APKBUILD
similarity index 100%
rename from extra/flac/APKBUILD
rename to main/flac/APKBUILD
diff --git a/extra/fping/APKBUILD b/main/fping/APKBUILD
similarity index 100%
rename from extra/fping/APKBUILD
rename to main/fping/APKBUILD
diff --git a/extra/freetds/APKBUILD b/main/freetds/APKBUILD
similarity index 100%
rename from extra/freetds/APKBUILD
rename to main/freetds/APKBUILD
diff --git a/extra/freetype/10-bytecode.patch b/main/freetype/10-bytecode.patch
similarity index 100%
rename from extra/freetype/10-bytecode.patch
rename to main/freetype/10-bytecode.patch
diff --git a/extra/freetype/20-enable-spr.patch b/main/freetype/20-enable-spr.patch
similarity index 100%
rename from extra/freetype/20-enable-spr.patch
rename to main/freetype/20-enable-spr.patch
diff --git a/extra/freetype/30-enable-valid.patch b/main/freetype/30-enable-valid.patch
similarity index 100%
rename from extra/freetype/30-enable-valid.patch
rename to main/freetype/30-enable-valid.patch
diff --git a/extra/freetype/40-memcpy-fix.patch b/main/freetype/40-memcpy-fix.patch
similarity index 100%
rename from extra/freetype/40-memcpy-fix.patch
rename to main/freetype/40-memcpy-fix.patch
diff --git a/extra/freetype/APKBUILD b/main/freetype/APKBUILD
similarity index 100%
rename from extra/freetype/APKBUILD
rename to main/freetype/APKBUILD
diff --git a/extra/gawk/APKBUILD b/main/gawk/APKBUILD
similarity index 100%
rename from extra/gawk/APKBUILD
rename to main/gawk/APKBUILD
diff --git a/extra/gawk/gawk.post-deinstall b/main/gawk/gawk.post-deinstall
similarity index 100%
rename from extra/gawk/gawk.post-deinstall
rename to main/gawk/gawk.post-deinstall
diff --git a/extra/gd/APKBUILD b/main/gd/APKBUILD
similarity index 100%
rename from extra/gd/APKBUILD
rename to main/gd/APKBUILD
diff --git a/extra/gdb/50_all_gdb-pie-1.patch b/main/gdb/50_all_gdb-pie-1.patch
similarity index 100%
rename from extra/gdb/50_all_gdb-pie-1.patch
rename to main/gdb/50_all_gdb-pie-1.patch
diff --git a/extra/gdb/50_all_gdb-pie-2.patch b/main/gdb/50_all_gdb-pie-2.patch
similarity index 100%
rename from extra/gdb/50_all_gdb-pie-2.patch
rename to main/gdb/50_all_gdb-pie-2.patch
diff --git a/extra/gdb/APKBUILD b/main/gdb/APKBUILD
similarity index 100%
rename from extra/gdb/APKBUILD
rename to main/gdb/APKBUILD
diff --git a/extra/gdbm/10-gdbm-1.8.3-fix-install-ownership.patch b/main/gdbm/10-gdbm-1.8.3-fix-install-ownership.patch
similarity index 100%
rename from extra/gdbm/10-gdbm-1.8.3-fix-install-ownership.patch
rename to main/gdbm/10-gdbm-1.8.3-fix-install-ownership.patch
diff --git a/extra/gdbm/20-gdbm-1.8.3-compat-linking.patch b/main/gdbm/20-gdbm-1.8.3-compat-linking.patch
similarity index 100%
rename from extra/gdbm/20-gdbm-1.8.3-compat-linking.patch
rename to main/gdbm/20-gdbm-1.8.3-compat-linking.patch
diff --git a/extra/gdbm/30-gdbm-1.8.3-build.patch b/main/gdbm/30-gdbm-1.8.3-build.patch
similarity index 100%
rename from extra/gdbm/30-gdbm-1.8.3-build.patch
rename to main/gdbm/30-gdbm-1.8.3-build.patch
diff --git a/extra/gdbm/APKBUILD b/main/gdbm/APKBUILD
similarity index 100%
rename from extra/gdbm/APKBUILD
rename to main/gdbm/APKBUILD
diff --git a/extra/gettext/APKBUILD b/main/gettext/APKBUILD
similarity index 100%
rename from extra/gettext/APKBUILD
rename to main/gettext/APKBUILD
diff --git a/extra/ghostscript/APKBUILD b/main/ghostscript/APKBUILD
similarity index 100%
rename from extra/ghostscript/APKBUILD
rename to main/ghostscript/APKBUILD
diff --git a/extra/glib/APKBUILD b/main/glib/APKBUILD
similarity index 100%
rename from extra/glib/APKBUILD
rename to main/glib/APKBUILD
diff --git a/extra/gnats/APKBUILD b/main/gnats/APKBUILD
similarity index 100%
rename from extra/gnats/APKBUILD
rename to main/gnats/APKBUILD
diff --git a/extra/gnats/gnats.pre-install b/main/gnats/gnats.pre-install
similarity index 100%
rename from extra/gnats/gnats.pre-install
rename to main/gnats/gnats.pre-install
diff --git a/extra/gnupg/APKBUILD b/main/gnupg/APKBUILD
similarity index 100%
rename from extra/gnupg/APKBUILD
rename to main/gnupg/APKBUILD
diff --git a/extra/gnutls/APKBUILD b/main/gnutls/APKBUILD
similarity index 100%
rename from extra/gnutls/APKBUILD
rename to main/gnutls/APKBUILD
diff --git a/extra/gperf/APKBUILD b/main/gperf/APKBUILD
similarity index 100%
rename from extra/gperf/APKBUILD
rename to main/gperf/APKBUILD
diff --git a/extra/grep/APKBUILD b/main/grep/APKBUILD
similarity index 100%
rename from extra/grep/APKBUILD
rename to main/grep/APKBUILD
diff --git a/extra/grep/grep.post-deinstall b/main/grep/grep.post-deinstall
similarity index 100%
rename from extra/grep/grep.post-deinstall
rename to main/grep/grep.post-deinstall
diff --git a/extra/gross/APKBUILD b/main/gross/APKBUILD
similarity index 100%
rename from extra/gross/APKBUILD
rename to main/gross/APKBUILD
diff --git a/extra/gross/gross-1.0.1-configure.ac.patch b/main/gross/gross-1.0.1-configure.ac.patch
similarity index 100%
rename from extra/gross/gross-1.0.1-configure.ac.patch
rename to main/gross/gross-1.0.1-configure.ac.patch
diff --git a/extra/gross/gross-1.0.1-default-conf.patch b/main/gross/gross-1.0.1-default-conf.patch
similarity index 100%
rename from extra/gross/gross-1.0.1-default-conf.patch
rename to main/gross/gross-1.0.1-default-conf.patch
diff --git a/extra/gross/gross-1.0.1-user.patch b/main/gross/gross-1.0.1-user.patch
similarity index 100%
rename from extra/gross/gross-1.0.1-user.patch
rename to main/gross/gross-1.0.1-user.patch
diff --git a/extra/gross/gross.post-install b/main/gross/gross.post-install
similarity index 100%
rename from extra/gross/gross.post-install
rename to main/gross/gross.post-install
diff --git a/extra/gross/gross.post-upgrade b/main/gross/gross.post-upgrade
similarity index 100%
rename from extra/gross/gross.post-upgrade
rename to main/gross/gross.post-upgrade
diff --git a/extra/gross/gross.pre-install b/main/gross/gross.pre-install
similarity index 100%
rename from extra/gross/gross.pre-install
rename to main/gross/gross.pre-install
diff --git a/extra/gross/gross.pre-upgrade b/main/gross/gross.pre-upgrade
similarity index 100%
rename from extra/gross/gross.pre-upgrade
rename to main/gross/gross.pre-upgrade
diff --git a/extra/gross/grossd.confd b/main/gross/grossd.confd
similarity index 100%
rename from extra/gross/grossd.confd
rename to main/gross/grossd.confd
diff --git a/extra/gross/grossd.initd b/main/gross/grossd.initd
similarity index 100%
rename from extra/gross/grossd.initd
rename to main/gross/grossd.initd
diff --git a/extra/gzip/APKBUILD b/main/gzip/APKBUILD
similarity index 100%
rename from extra/gzip/APKBUILD
rename to main/gzip/APKBUILD
diff --git a/extra/gzip/gzip.post-deinstall b/main/gzip/gzip.post-deinstall
similarity index 100%
rename from extra/gzip/gzip.post-deinstall
rename to main/gzip/gzip.post-deinstall
diff --git a/extra/haserl/APKBUILD b/main/haserl/APKBUILD
similarity index 100%
rename from extra/haserl/APKBUILD
rename to main/haserl/APKBUILD
diff --git a/extra/heimdal/001_all_heimdal-no_libedit.patch b/main/heimdal/001_all_heimdal-no_libedit.patch
similarity index 100%
rename from extra/heimdal/001_all_heimdal-no_libedit.patch
rename to main/heimdal/001_all_heimdal-no_libedit.patch
diff --git a/extra/heimdal/002_all_heimdal-fPIC.patch b/main/heimdal/002_all_heimdal-fPIC.patch
similarity index 100%
rename from extra/heimdal/002_all_heimdal-fPIC.patch
rename to main/heimdal/002_all_heimdal-fPIC.patch
diff --git a/extra/heimdal/003_all_heimdal-rxapps.patch b/main/heimdal/003_all_heimdal-rxapps.patch
similarity index 100%
rename from extra/heimdal/003_all_heimdal-rxapps.patch
rename to main/heimdal/003_all_heimdal-rxapps.patch
diff --git a/extra/heimdal/005_all_heimdal-suid_fix.patch b/main/heimdal/005_all_heimdal-suid_fix.patch
similarity index 100%
rename from extra/heimdal/005_all_heimdal-suid_fix.patch
rename to main/heimdal/005_all_heimdal-suid_fix.patch
diff --git a/extra/heimdal/013_all_heimdal-pthread-lib.patch b/main/heimdal/013_all_heimdal-pthread-lib.patch
similarity index 100%
rename from extra/heimdal/013_all_heimdal-pthread-lib.patch
rename to main/heimdal/013_all_heimdal-pthread-lib.patch
diff --git a/extra/heimdal/014_all_heimdal-path.patch b/main/heimdal/014_all_heimdal-path.patch
similarity index 100%
rename from extra/heimdal/014_all_heimdal-path.patch
rename to main/heimdal/014_all_heimdal-path.patch
diff --git a/extra/heimdal/022_all_heimdal-as-needed.patch b/main/heimdal/022_all_heimdal-as-needed.patch
similarity index 100%
rename from extra/heimdal/022_all_heimdal-as-needed.patch
rename to main/heimdal/022_all_heimdal-as-needed.patch
diff --git a/extra/heimdal/APKBUILD b/main/heimdal/APKBUILD
similarity index 100%
rename from extra/heimdal/APKBUILD
rename to main/heimdal/APKBUILD
diff --git a/extra/heimdal/heimdal-kadmind.init b/main/heimdal/heimdal-kadmind.init
similarity index 100%
rename from extra/heimdal/heimdal-kadmind.init
rename to main/heimdal/heimdal-kadmind.init
diff --git a/extra/heimdal/heimdal-kdc.init b/main/heimdal/heimdal-kdc.init
similarity index 100%
rename from extra/heimdal/heimdal-kdc.init
rename to main/heimdal/heimdal-kdc.init
diff --git a/extra/heimdal/heimdal-kpasswdd.init b/main/heimdal/heimdal-kpasswdd.init
similarity index 100%
rename from extra/heimdal/heimdal-kpasswdd.init
rename to main/heimdal/heimdal-kpasswdd.init
diff --git a/extra/heimdal/heimdal-r23235-kb5-libwind_la.patch b/main/heimdal/heimdal-r23235-kb5-libwind_la.patch
similarity index 100%
rename from extra/heimdal/heimdal-r23235-kb5-libwind_la.patch
rename to main/heimdal/heimdal-r23235-kb5-libwind_la.patch
diff --git a/extra/heimdal/heimdal-r23238-kb5_locl_h-wind_h.patch b/main/heimdal/heimdal-r23238-kb5_locl_h-wind_h.patch
similarity index 100%
rename from extra/heimdal/heimdal-r23238-kb5_locl_h-wind_h.patch
rename to main/heimdal/heimdal-r23238-kb5_locl_h-wind_h.patch
diff --git a/extra/heimdal/heimdal-system_sqlite.patch b/main/heimdal/heimdal-system_sqlite.patch
similarity index 100%
rename from extra/heimdal/heimdal-system_sqlite.patch
rename to main/heimdal/heimdal-system_sqlite.patch
diff --git a/extra/htop/APKBUILD b/main/htop/APKBUILD
similarity index 100%
rename from extra/htop/APKBUILD
rename to main/htop/APKBUILD
diff --git a/extra/hunspell/APKBUILD b/main/hunspell/APKBUILD
similarity index 100%
rename from extra/hunspell/APKBUILD
rename to main/hunspell/APKBUILD
diff --git a/extra/hylafax/APKBUILD b/main/hylafax/APKBUILD
similarity index 100%
rename from extra/hylafax/APKBUILD
rename to main/hylafax/APKBUILD
diff --git a/extra/hylafax/hylafax.post-install b/main/hylafax/hylafax.post-install
similarity index 100%
rename from extra/hylafax/hylafax.post-install
rename to main/hylafax/hylafax.post-install
diff --git a/extra/hypermail/APKBUILD b/main/hypermail/APKBUILD
similarity index 100%
rename from extra/hypermail/APKBUILD
rename to main/hypermail/APKBUILD
diff --git a/extra/hypermail/mdir2mbox.lua b/main/hypermail/mdir2mbox.lua
similarity index 100%
rename from extra/hypermail/mdir2mbox.lua
rename to main/hypermail/mdir2mbox.lua
diff --git a/extra/iaxmodem/APKBUILD b/main/iaxmodem/APKBUILD
similarity index 100%
rename from extra/iaxmodem/APKBUILD
rename to main/iaxmodem/APKBUILD
diff --git a/extra/iaxmodem/iaxmodem.confd b/main/iaxmodem/iaxmodem.confd
similarity index 100%
rename from extra/iaxmodem/iaxmodem.confd
rename to main/iaxmodem/iaxmodem.confd
diff --git a/extra/iaxmodem/iaxmodem.initd b/main/iaxmodem/iaxmodem.initd
similarity index 100%
rename from extra/iaxmodem/iaxmodem.initd
rename to main/iaxmodem/iaxmodem.initd
diff --git a/extra/iaxmodem/nocxx.patch b/main/iaxmodem/nocxx.patch
similarity index 100%
rename from extra/iaxmodem/nocxx.patch
rename to main/iaxmodem/nocxx.patch
diff --git a/extra/icu/APKBUILD b/main/icu/APKBUILD
similarity index 100%
rename from extra/icu/APKBUILD
rename to main/icu/APKBUILD
diff --git a/extra/imagemagick/APKBUILD b/main/imagemagick/APKBUILD
similarity index 100%
rename from extra/imagemagick/APKBUILD
rename to main/imagemagick/APKBUILD
diff --git a/extra/iproute2-qos/APKBUILD b/main/iproute2-qos/APKBUILD
similarity index 100%
rename from extra/iproute2-qos/APKBUILD
rename to main/iproute2-qos/APKBUILD
diff --git a/extra/iproute2-qos/qos.confd b/main/iproute2-qos/qos.confd
similarity index 100%
rename from extra/iproute2-qos/qos.confd
rename to main/iproute2-qos/qos.confd
diff --git a/extra/iproute2-qos/qos.initd b/main/iproute2-qos/qos.initd
similarity index 100%
rename from extra/iproute2-qos/qos.initd
rename to main/iproute2-qos/qos.initd
diff --git a/extra/iproute2-qos/setup-qos b/main/iproute2-qos/setup-qos
similarity index 100%
rename from extra/iproute2-qos/setup-qos
rename to main/iproute2-qos/setup-qos
diff --git a/extra/ipsec-tools/00-verify-cert-leak.patch b/main/ipsec-tools/00-verify-cert-leak.patch
similarity index 100%
rename from extra/ipsec-tools/00-verify-cert-leak.patch
rename to main/ipsec-tools/00-verify-cert-leak.patch
diff --git a/extra/ipsec-tools/20-natoa-fix.patch b/main/ipsec-tools/20-natoa-fix.patch
similarity index 100%
rename from extra/ipsec-tools/20-natoa-fix.patch
rename to main/ipsec-tools/20-natoa-fix.patch
diff --git a/extra/ipsec-tools/30-natt-ports-cleanup.patch b/main/ipsec-tools/30-natt-ports-cleanup.patch
similarity index 100%
rename from extra/ipsec-tools/30-natt-ports-cleanup.patch
rename to main/ipsec-tools/30-natt-ports-cleanup.patch
diff --git a/extra/ipsec-tools/40-cmpsaddr-cleanup.patch b/main/ipsec-tools/40-cmpsaddr-cleanup.patch
similarity index 100%
rename from extra/ipsec-tools/40-cmpsaddr-cleanup.patch
rename to main/ipsec-tools/40-cmpsaddr-cleanup.patch
diff --git a/extra/ipsec-tools/50-reverse-connect.patch b/main/ipsec-tools/50-reverse-connect.patch
similarity index 100%
rename from extra/ipsec-tools/50-reverse-connect.patch
rename to main/ipsec-tools/50-reverse-connect.patch
diff --git a/extra/ipsec-tools/60-debug-quick.patch b/main/ipsec-tools/60-debug-quick.patch
similarity index 100%
rename from extra/ipsec-tools/60-debug-quick.patch
rename to main/ipsec-tools/60-debug-quick.patch
diff --git a/extra/ipsec-tools/APKBUILD b/main/ipsec-tools/APKBUILD
similarity index 100%
rename from extra/ipsec-tools/APKBUILD
rename to main/ipsec-tools/APKBUILD
diff --git a/extra/ipsec-tools/racoon.confd b/main/ipsec-tools/racoon.confd
similarity index 100%
rename from extra/ipsec-tools/racoon.confd
rename to main/ipsec-tools/racoon.confd
diff --git a/extra/ipsec-tools/racoon.initd b/main/ipsec-tools/racoon.initd
similarity index 100%
rename from extra/ipsec-tools/racoon.initd
rename to main/ipsec-tools/racoon.initd
diff --git a/extra/iptraf/APKBUILD b/main/iptraf/APKBUILD
similarity index 100%
rename from extra/iptraf/APKBUILD
rename to main/iptraf/APKBUILD
diff --git a/extra/iputils/APKBUILD b/main/iputils/APKBUILD
similarity index 100%
rename from extra/iputils/APKBUILD
rename to main/iputils/APKBUILD
diff --git a/extra/iputils/iputils-20070202-no-open-max.patch b/main/iputils/iputils-20070202-no-open-max.patch
similarity index 100%
rename from extra/iputils/iputils-20070202-no-open-max.patch
rename to main/iputils/iputils-20070202-no-open-max.patch
diff --git a/extra/iputils/iputils.post-install b/main/iputils/iputils.post-install
similarity index 100%
rename from extra/iputils/iputils.post-install
rename to main/iputils/iputils.post-install
diff --git a/extra/irssi/APKBUILD b/main/irssi/APKBUILD
similarity index 100%
rename from extra/irssi/APKBUILD
rename to main/irssi/APKBUILD
diff --git a/extra/jpeg/APKBUILD b/main/jpeg/APKBUILD
similarity index 100%
rename from extra/jpeg/APKBUILD
rename to main/jpeg/APKBUILD
diff --git a/extra/json4lua/APKBUILD b/main/json4lua/APKBUILD
similarity index 100%
rename from extra/json4lua/APKBUILD
rename to main/json4lua/APKBUILD
diff --git a/extra/ksymoops/APKBUILD b/main/ksymoops/APKBUILD
similarity index 100%
rename from extra/ksymoops/APKBUILD
rename to main/ksymoops/APKBUILD
diff --git a/extra/less/APKBUILD b/main/less/APKBUILD
similarity index 100%
rename from extra/less/APKBUILD
rename to main/less/APKBUILD
diff --git a/extra/less/less.post-deinstall b/main/less/less.post-deinstall
similarity index 100%
rename from extra/less/less.post-deinstall
rename to main/less/less.post-deinstall
diff --git a/extra/lftp/APKBUILD b/main/lftp/APKBUILD
similarity index 100%
rename from extra/lftp/APKBUILD
rename to main/lftp/APKBUILD
diff --git a/extra/lha/APKBUILD b/main/lha/APKBUILD
similarity index 100%
rename from extra/lha/APKBUILD
rename to main/lha/APKBUILD
diff --git a/extra/libao/APKBUILD b/main/libao/APKBUILD
similarity index 100%
rename from extra/libao/APKBUILD
rename to main/libao/APKBUILD
diff --git a/extra/libart-lgpl/APKBUILD b/main/libart-lgpl/APKBUILD
similarity index 100%
rename from extra/libart-lgpl/APKBUILD
rename to main/libart-lgpl/APKBUILD
diff --git a/extra/libassuan/APKBUILD b/main/libassuan/APKBUILD
similarity index 100%
rename from extra/libassuan/APKBUILD
rename to main/libassuan/APKBUILD
diff --git a/extra/libcap/APKBUILD b/main/libcap/APKBUILD
similarity index 57%
rename from extra/libcap/APKBUILD
rename to main/libcap/APKBUILD
index 36c09984c296..731729c03a01 100644
--- a/extra/libcap/APKBUILD
+++ b/main/libcap/APKBUILD
@@ -1,18 +1,23 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libcap
pkgver=2.16
pkgrel=1
pkgdesc="POSIX 1003.1e capabilities"
license="GPL"
url="http://www.friedhoff.org/posixfilecaps.html"
-depends="uclibc"
-makedepends=""
+depends=
+makedepends="perl"
source="http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/$pkgname-$pkgver.tar.gz
+ include-order.patch
"
subpackages="$pkgname-doc $pkgname-dev"
-build ()
+build ()
{
cd "$srcdir/$pkgname-$pkgver"
+ patch -p1 < ../include-order.patch || return 1
+
make lib=/lib prefix=/usr LIBATTR=no DESTDIR="$pkgdir" install
}
-md5sums="9e075fda242c4070ba76407064c13302 libcap-2.16.tar.gz"
+md5sums="9e075fda242c4070ba76407064c13302 libcap-2.16.tar.gz
+db5c78e0ab579bb6723fff5ebb2fd530 include-order.patch"
diff --git a/main/libcap/include-order.patch b/main/libcap/include-order.patch
new file mode 100644
index 000000000000..88c5fcc6c837
--- /dev/null
+++ b/main/libcap/include-order.patch
@@ -0,0 +1,16 @@
+diff -ur a/progs/capsh.c b/progs/capsh.c
+--- a/progs/capsh.c 2009-07-24 07:14:03.000000000 +0000
++++ b/progs/capsh.c 2009-07-24 07:14:19.000000000 +0000
+@@ -12,11 +12,11 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
++#include <sys/wait.h>
+ #include <sys/prctl.h>
+ #include <sys/capability.h>
+ #include <unistd.h>
+ #include <errno.h>
+-#include <sys/wait.h>
+
+ /* prctl based API for altering character of current process */
+ #define PR_GET_KEEPCAPS 7
diff --git a/extra/libconfig/APKBUILD b/main/libconfig/APKBUILD
similarity index 100%
rename from extra/libconfig/APKBUILD
rename to main/libconfig/APKBUILD
diff --git a/extra/libexif/APKBUILD b/main/libexif/APKBUILD
similarity index 100%
rename from extra/libexif/APKBUILD
rename to main/libexif/APKBUILD
diff --git a/extra/libgcrypt/APKBUILD b/main/libgcrypt/APKBUILD
similarity index 100%
rename from extra/libgcrypt/APKBUILD
rename to main/libgcrypt/APKBUILD
diff --git a/extra/libgcrypt/nocxx.patch b/main/libgcrypt/nocxx.patch
similarity index 100%
rename from extra/libgcrypt/nocxx.patch
rename to main/libgcrypt/nocxx.patch
diff --git a/extra/libgpg-error/APKBUILD b/main/libgpg-error/APKBUILD
similarity index 100%
rename from extra/libgpg-error/APKBUILD
rename to main/libgpg-error/APKBUILD
diff --git a/extra/libgpg-error/nocxx.patch b/main/libgpg-error/nocxx.patch
similarity index 100%
rename from extra/libgpg-error/nocxx.patch
rename to main/libgpg-error/nocxx.patch
diff --git a/extra/libiconv/APKBUILD b/main/libiconv/APKBUILD
similarity index 100%
rename from extra/libiconv/APKBUILD
rename to main/libiconv/APKBUILD
diff --git a/extra/libid3tag/APKBUILD b/main/libid3tag/APKBUILD
similarity index 100%
rename from extra/libid3tag/APKBUILD
rename to main/libid3tag/APKBUILD
diff --git a/extra/libidn/APKBUILD b/main/libidn/APKBUILD
similarity index 100%
rename from extra/libidn/APKBUILD
rename to main/libidn/APKBUILD
diff --git a/extra/libksba/APKBUILD b/main/libksba/APKBUILD
similarity index 100%
rename from extra/libksba/APKBUILD
rename to main/libksba/APKBUILD
diff --git a/extra/libmcrypt/APKBUILD b/main/libmcrypt/APKBUILD
similarity index 100%
rename from extra/libmcrypt/APKBUILD
rename to main/libmcrypt/APKBUILD
diff --git a/extra/libnet/APKBUILD b/main/libnet/APKBUILD
similarity index 100%
rename from extra/libnet/APKBUILD
rename to main/libnet/APKBUILD
diff --git a/extra/libnet/libnet-1.1.2.1-autotools.patch b/main/libnet/libnet-1.1.2.1-autotools.patch
similarity index 100%
rename from extra/libnet/libnet-1.1.2.1-autotools.patch
rename to main/libnet/libnet-1.1.2.1-autotools.patch
diff --git a/extra/libnet/libnet-1.1.2.1-fix-chksum.patch b/main/libnet/libnet-1.1.2.1-fix-chksum.patch
similarity index 100%
rename from extra/libnet/libnet-1.1.2.1-fix-chksum.patch
rename to main/libnet/libnet-1.1.2.1-fix-chksum.patch
diff --git a/extra/libnetfilter_conntrack/APKBUILD b/main/libnetfilter_conntrack/APKBUILD
similarity index 100%
rename from extra/libnetfilter_conntrack/APKBUILD
rename to main/libnetfilter_conntrack/APKBUILD
diff --git a/extra/libnfnetlink/APKBUILD b/main/libnfnetlink/APKBUILD
similarity index 100%
rename from extra/libnfnetlink/APKBUILD
rename to main/libnfnetlink/APKBUILD
diff --git a/extra/libogg/APKBUILD b/main/libogg/APKBUILD
similarity index 83%
rename from extra/libogg/APKBUILD
rename to main/libogg/APKBUILD
index d7920f886803..8cfbf96871ca 100644
--- a/extra/libogg/APKBUILD
+++ b/main/libogg/APKBUILD
@@ -1,22 +1,20 @@
# Contributor: Mika Havela <mika.havela@gmail.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+
pkgname=libogg
pkgver=1.1.3
pkgrel=0
pkgdesc="Ogg bitstream and framing library"
url="http://xiph.org/ogg/"
license="as-is"
-depends="uclibc"
+depends=
subpackages="$pkgname-doc $pkgname-dev"
source="http://downloads.xiph.org/releases/ogg/$pkgname-$pkgver.tar.gz
- nocxx.patch
"
build() {
cd "$srcdir/$pkgname-$pkgver"
- msg "Punting useless CXX check..."
- patch -p1 < "$srcdir"/nocxx.patch || return 1
-
./configure --prefix=/usr
make || return 1
make -j1 DESTDIR="$pkgdir" install
diff --git a/extra/libogg/nocxx.patch b/main/libogg/nocxx.patch
similarity index 100%
rename from extra/libogg/nocxx.patch
rename to main/libogg/nocxx.patch
diff --git a/extra/libpng/APKBUILD b/main/libpng/APKBUILD
similarity index 100%
rename from extra/libpng/APKBUILD
rename to main/libpng/APKBUILD
diff --git a/extra/libpri/APKBUILD b/main/libpri/APKBUILD
similarity index 100%
rename from extra/libpri/APKBUILD
rename to main/libpri/APKBUILD
diff --git a/extra/libpri/libpri-1.4.9-i14292.patch b/main/libpri/libpri-1.4.9-i14292.patch
similarity index 100%
rename from extra/libpri/libpri-1.4.9-i14292.patch
rename to main/libpri/libpri-1.4.9-i14292.patch
diff --git a/extra/libpri/libpri-cflags.patch b/main/libpri/libpri-cflags.patch
similarity index 100%
rename from extra/libpri/libpri-cflags.patch
rename to main/libpri/libpri-cflags.patch
diff --git a/extra/libsamplerate/APKBUILD b/main/libsamplerate/APKBUILD
similarity index 100%
rename from extra/libsamplerate/APKBUILD
rename to main/libsamplerate/APKBUILD
diff --git a/extra/libsndfile/APKBUILD b/main/libsndfile/APKBUILD
similarity index 100%
rename from extra/libsndfile/APKBUILD
rename to main/libsndfile/APKBUILD
diff --git a/extra/libtasn1/APKBUILD b/main/libtasn1/APKBUILD
similarity index 100%
rename from extra/libtasn1/APKBUILD
rename to main/libtasn1/APKBUILD
diff --git a/extra/libtheora/APKBUILD b/main/libtheora/APKBUILD
similarity index 100%
rename from extra/libtheora/APKBUILD
rename to main/libtheora/APKBUILD
diff --git a/extra/libusb-compat/APKBUILD b/main/libusb-compat/APKBUILD
similarity index 100%
rename from extra/libusb-compat/APKBUILD
rename to main/libusb-compat/APKBUILD
diff --git a/extra/libusb/APKBUILD b/main/libusb/APKBUILD
similarity index 100%
rename from extra/libusb/APKBUILD
rename to main/libusb/APKBUILD
diff --git a/extra/libvorbis/APKBUILD b/main/libvorbis/APKBUILD
similarity index 100%
rename from extra/libvorbis/APKBUILD
rename to main/libvorbis/APKBUILD
diff --git a/extra/libxml2/APKBUILD b/main/libxml2/APKBUILD
similarity index 100%
rename from extra/libxml2/APKBUILD
rename to main/libxml2/APKBUILD
diff --git a/extra/libxml2/nocxx.patch b/main/libxml2/nocxx.patch
similarity index 100%
rename from extra/libxml2/nocxx.patch
rename to main/libxml2/nocxx.patch
diff --git a/extra/libxslt/APKBUILD b/main/libxslt/APKBUILD
similarity index 100%
rename from extra/libxslt/APKBUILD
rename to main/libxslt/APKBUILD
diff --git a/extra/lighttpd/APKBUILD b/main/lighttpd/APKBUILD
similarity index 100%
rename from extra/lighttpd/APKBUILD
rename to main/lighttpd/APKBUILD
diff --git a/extra/lighttpd/lighttpd.conf b/main/lighttpd/lighttpd.conf
similarity index 100%
rename from extra/lighttpd/lighttpd.conf
rename to main/lighttpd/lighttpd.conf
diff --git a/extra/lighttpd/lighttpd.confd b/main/lighttpd/lighttpd.confd
similarity index 100%
rename from extra/lighttpd/lighttpd.confd
rename to main/lighttpd/lighttpd.confd
diff --git a/extra/lighttpd/lighttpd.initd b/main/lighttpd/lighttpd.initd
similarity index 100%
rename from extra/lighttpd/lighttpd.initd
rename to main/lighttpd/lighttpd.initd
diff --git a/extra/lighttpd/lighttpd.logrotate b/main/lighttpd/lighttpd.logrotate
similarity index 100%
rename from extra/lighttpd/lighttpd.logrotate
rename to main/lighttpd/lighttpd.logrotate
diff --git a/extra/lighttpd/lighttpd.post-install b/main/lighttpd/lighttpd.post-install
similarity index 100%
rename from extra/lighttpd/lighttpd.post-install
rename to main/lighttpd/lighttpd.post-install
diff --git a/extra/lighttpd/lighttpd.pre-install b/main/lighttpd/lighttpd.pre-install
similarity index 100%
rename from extra/lighttpd/lighttpd.pre-install
rename to main/lighttpd/lighttpd.pre-install
diff --git a/extra/lighttpd/mime-types.conf b/main/lighttpd/mime-types.conf
similarity index 100%
rename from extra/lighttpd/mime-types.conf
rename to main/lighttpd/mime-types.conf
diff --git a/extra/lighttpd/mod_cgi.conf b/main/lighttpd/mod_cgi.conf
similarity index 100%
rename from extra/lighttpd/mod_cgi.conf
rename to main/lighttpd/mod_cgi.conf
diff --git a/extra/lighttpd/mod_fastcgi.conf b/main/lighttpd/mod_fastcgi.conf
similarity index 100%
rename from extra/lighttpd/mod_fastcgi.conf
rename to main/lighttpd/mod_fastcgi.conf
diff --git a/extra/lighttpd/spawn-fcgi.confd b/main/lighttpd/spawn-fcgi.confd
similarity index 100%
rename from extra/lighttpd/spawn-fcgi.confd
rename to main/lighttpd/spawn-fcgi.confd
diff --git a/extra/lighttpd/spawn-fcgi.initd b/main/lighttpd/spawn-fcgi.initd
similarity index 100%
rename from extra/lighttpd/spawn-fcgi.initd
rename to main/lighttpd/spawn-fcgi.initd
diff --git a/extra/links/APKBUILD b/main/links/APKBUILD
similarity index 100%
rename from extra/links/APKBUILD
rename to main/links/APKBUILD
diff --git a/extra/lm_sensors/APKBUILD b/main/lm_sensors/APKBUILD
similarity index 100%
rename from extra/lm_sensors/APKBUILD
rename to main/lm_sensors/APKBUILD
diff --git a/extra/lm_sensors/fancontrol.initd b/main/lm_sensors/fancontrol.initd
similarity index 100%
rename from extra/lm_sensors/fancontrol.initd
rename to main/lm_sensors/fancontrol.initd
diff --git a/extra/lm_sensors/lm_sensors-3.1.0-sensors-detect-alpine.patch b/main/lm_sensors/lm_sensors-3.1.0-sensors-detect-alpine.patch
similarity index 100%
rename from extra/lm_sensors/lm_sensors-3.1.0-sensors-detect-alpine.patch
rename to main/lm_sensors/lm_sensors-3.1.0-sensors-detect-alpine.patch
diff --git a/extra/lm_sensors/lm_sensors.initd b/main/lm_sensors/lm_sensors.initd
similarity index 100%
rename from extra/lm_sensors/lm_sensors.initd
rename to main/lm_sensors/lm_sensors.initd
diff --git a/extra/lm_sensors/sensord.confd b/main/lm_sensors/sensord.confd
similarity index 100%
rename from extra/lm_sensors/sensord.confd
rename to main/lm_sensors/sensord.confd
diff --git a/extra/lm_sensors/sensord.initd b/main/lm_sensors/sensord.initd
similarity index 100%
rename from extra/lm_sensors/sensord.initd
rename to main/lm_sensors/sensord.initd
diff --git a/extra/lm_sensors/sensors.install b/main/lm_sensors/sensors.install
similarity index 100%
rename from extra/lm_sensors/sensors.install
rename to main/lm_sensors/sensors.install
diff --git a/extra/logrotate/APKBUILD b/main/logrotate/APKBUILD
similarity index 100%
rename from extra/logrotate/APKBUILD
rename to main/logrotate/APKBUILD
diff --git a/extra/lpc/APKBUILD b/main/lpc/APKBUILD
similarity index 100%
rename from extra/lpc/APKBUILD
rename to main/lpc/APKBUILD
diff --git a/extra/lua/APKBUILD b/main/lua/APKBUILD
similarity index 100%
rename from extra/lua/APKBUILD
rename to main/lua/APKBUILD
diff --git a/extra/lua/lua-5.1-make.patch b/main/lua/lua-5.1-make.patch
similarity index 100%
rename from extra/lua/lua-5.1-make.patch
rename to main/lua/lua-5.1-make.patch
diff --git a/extra/lua/lua-5.1-module_paths.patch b/main/lua/lua-5.1-module_paths.patch
similarity index 100%
rename from extra/lua/lua-5.1-module_paths.patch
rename to main/lua/lua-5.1-module_paths.patch
diff --git a/extra/luaposix/APKBUILD b/main/luaposix/APKBUILD
similarity index 100%
rename from extra/luaposix/APKBUILD
rename to main/luaposix/APKBUILD
diff --git a/extra/luasql-postgres/APKBUILD b/main/luasql-postgres/APKBUILD
similarity index 100%
rename from extra/luasql-postgres/APKBUILD
rename to main/luasql-postgres/APKBUILD
diff --git a/extra/luasql-postgres/config.new b/main/luasql-postgres/config.new
similarity index 100%
rename from extra/luasql-postgres/config.new
rename to main/luasql-postgres/config.new
diff --git a/extra/lzo/APKBUILD b/main/lzo/APKBUILD
similarity index 100%
rename from extra/lzo/APKBUILD
rename to main/lzo/APKBUILD
diff --git a/extra/man-pages/APKBUILD b/main/man-pages/APKBUILD
similarity index 100%
rename from extra/man-pages/APKBUILD
rename to main/man-pages/APKBUILD
diff --git a/extra/man/APKBUILD b/main/man/APKBUILD
similarity index 100%
rename from extra/man/APKBUILD
rename to main/man/APKBUILD
diff --git a/extra/man/man-troff.patch b/main/man/man-troff.patch
similarity index 100%
rename from extra/man/man-troff.patch
rename to main/man/man-troff.patch
diff --git a/extra/man/whatis.periodic.daily b/main/man/whatis.periodic.daily
similarity index 100%
rename from extra/man/whatis.periodic.daily
rename to main/man/whatis.periodic.daily
diff --git a/extra/md5/APKBUILD b/main/md5/APKBUILD
similarity index 100%
rename from extra/md5/APKBUILD
rename to main/md5/APKBUILD
diff --git a/extra/mini_httpd/APKBUILD b/main/mini_httpd/APKBUILD
similarity index 100%
rename from extra/mini_httpd/APKBUILD
rename to main/mini_httpd/APKBUILD
diff --git a/extra/mini_httpd/mini_httpd.conf.sample b/main/mini_httpd/mini_httpd.conf.sample
similarity index 100%
rename from extra/mini_httpd/mini_httpd.conf.sample
rename to main/mini_httpd/mini_httpd.conf.sample
diff --git a/extra/mini_httpd/mini_httpd.initd b/main/mini_httpd/mini_httpd.initd
similarity index 100%
rename from extra/mini_httpd/mini_httpd.initd
rename to main/mini_httpd/mini_httpd.initd
diff --git a/extra/mlmmj/APKBUILD b/main/mlmmj/APKBUILD
similarity index 100%
rename from extra/mlmmj/APKBUILD
rename to main/mlmmj/APKBUILD
diff --git a/extra/mpg123/APKBUILD b/main/mpg123/APKBUILD
similarity index 100%
rename from extra/mpg123/APKBUILD
rename to main/mpg123/APKBUILD
diff --git a/extra/mysql/APKBUILD b/main/mysql/APKBUILD
similarity index 100%
rename from extra/mysql/APKBUILD
rename to main/mysql/APKBUILD
diff --git a/extra/mysql/mysql.initd b/main/mysql/mysql.initd
similarity index 100%
rename from extra/mysql/mysql.initd
rename to main/mysql/mysql.initd
diff --git a/extra/mysql/mysql.mycnf b/main/mysql/mysql.mycnf
similarity index 100%
rename from extra/mysql/mysql.mycnf
rename to main/mysql/mysql.mycnf
diff --git a/extra/nano/APKBUILD b/main/nano/APKBUILD
similarity index 100%
rename from extra/nano/APKBUILD
rename to main/nano/APKBUILD
diff --git a/extra/ncftp/APKBUILD b/main/ncftp/APKBUILD
similarity index 100%
rename from extra/ncftp/APKBUILD
rename to main/ncftp/APKBUILD
diff --git a/extra/ncftp/ncftp.post-install b/main/ncftp/ncftp.post-install
similarity index 100%
rename from extra/ncftp/ncftp.post-install
rename to main/ncftp/ncftp.post-install
diff --git a/extra/neon/APKBUILD b/main/neon/APKBUILD
similarity index 100%
rename from extra/neon/APKBUILD
rename to main/neon/APKBUILD
diff --git a/extra/net-snmp/APKBUILD b/main/net-snmp/APKBUILD
similarity index 98%
rename from extra/net-snmp/APKBUILD
rename to main/net-snmp/APKBUILD
index 6a28088d574a..ac497cb9b3d0 100644
--- a/extra/net-snmp/APKBUILD
+++ b/main/net-snmp/APKBUILD
@@ -6,8 +6,8 @@ pkgrel=0
pkgdesc="Simple Network Management Protocol"
url="http://www.net-snmp.org/"
license="GPL"
-depends="uclibc"
-makedepends=""
+depends=
+makedepends="perl-dev"
subpackages="$pkgname-doc $pkgname-dev $pkgname-tools"
source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
snmpd.initd
diff --git a/extra/net-snmp/snmpd.confd b/main/net-snmp/snmpd.confd
similarity index 100%
rename from extra/net-snmp/snmpd.confd
rename to main/net-snmp/snmpd.confd
diff --git a/extra/net-snmp/snmpd.initd b/main/net-snmp/snmpd.initd
similarity index 100%
rename from extra/net-snmp/snmpd.initd
rename to main/net-snmp/snmpd.initd
diff --git a/extra/net-snmp/snmptrapd.confd b/main/net-snmp/snmptrapd.confd
similarity index 100%
rename from extra/net-snmp/snmptrapd.confd
rename to main/net-snmp/snmptrapd.confd
diff --git a/extra/net-snmp/snmptrapd.initd b/main/net-snmp/snmptrapd.initd
similarity index 100%
rename from extra/net-snmp/snmptrapd.initd
rename to main/net-snmp/snmptrapd.initd
diff --git a/extra/newt/APKBUILD b/main/newt/APKBUILD
similarity index 100%
rename from extra/newt/APKBUILD
rename to main/newt/APKBUILD
diff --git a/extra/newt/newt-0.52.7-notcl.patch b/main/newt/newt-0.52.7-notcl.patch
similarity index 100%
rename from extra/newt/newt-0.52.7-notcl.patch
rename to main/newt/newt-0.52.7-notcl.patch
diff --git a/extra/nfs-utils/APKBUILD b/main/nfs-utils/APKBUILD
similarity index 100%
rename from extra/nfs-utils/APKBUILD
rename to main/nfs-utils/APKBUILD
diff --git a/extra/nfs-utils/nfs-utils-mtab-sym.patch b/main/nfs-utils/nfs-utils-mtab-sym.patch
similarity index 100%
rename from extra/nfs-utils/nfs-utils-mtab-sym.patch
rename to main/nfs-utils/nfs-utils-mtab-sym.patch
diff --git a/extra/nfs-utils/nfs-utils-no-exec.patch b/main/nfs-utils/nfs-utils-no-exec.patch
similarity index 100%
rename from extra/nfs-utils/nfs-utils-no-exec.patch
rename to main/nfs-utils/nfs-utils-no-exec.patch
diff --git a/extra/nfs-utils/nfs.confd b/main/nfs-utils/nfs.confd
similarity index 100%
rename from extra/nfs-utils/nfs.confd
rename to main/nfs-utils/nfs.confd
diff --git a/extra/nfs-utils/nfs.exports b/main/nfs-utils/nfs.exports
similarity index 100%
rename from extra/nfs-utils/nfs.exports
rename to main/nfs-utils/nfs.exports
diff --git a/extra/nfs-utils/nfs.initd b/main/nfs-utils/nfs.initd
similarity index 100%
rename from extra/nfs-utils/nfs.initd
rename to main/nfs-utils/nfs.initd
diff --git a/extra/ngircd/APKBUILD b/main/ngircd/APKBUILD
similarity index 100%
rename from extra/ngircd/APKBUILD
rename to main/ngircd/APKBUILD
diff --git a/extra/ngircd/ngircd.initd b/main/ngircd/ngircd.initd
similarity index 100%
rename from extra/ngircd/ngircd.initd
rename to main/ngircd/ngircd.initd
diff --git a/extra/ngircd/ngircd.pre-install b/main/ngircd/ngircd.pre-install
similarity index 100%
rename from extra/ngircd/ngircd.pre-install
rename to main/ngircd/ngircd.pre-install
diff --git a/extra/nmap/APKBUILD b/main/nmap/APKBUILD
similarity index 100%
rename from extra/nmap/APKBUILD
rename to main/nmap/APKBUILD
diff --git a/extra/nmap/nmap-4.53-uclibc++-output.cc.patch b/main/nmap/nmap-4.53-uclibc++-output.cc.patch
similarity index 100%
rename from extra/nmap/nmap-4.53-uclibc++-output.cc.patch
rename to main/nmap/nmap-4.53-uclibc++-output.cc.patch
diff --git a/extra/ntfs-3g/APKBUILD b/main/ntfs-3g/APKBUILD
similarity index 100%
rename from extra/ntfs-3g/APKBUILD
rename to main/ntfs-3g/APKBUILD
diff --git a/extra/ntfs-3g/nocxx.patch b/main/ntfs-3g/nocxx.patch
similarity index 100%
rename from extra/ntfs-3g/nocxx.patch
rename to main/ntfs-3g/nocxx.patch
diff --git a/extra/oidentd/APKBUILD b/main/oidentd/APKBUILD
similarity index 100%
rename from extra/oidentd/APKBUILD
rename to main/oidentd/APKBUILD
diff --git a/extra/oidentd/oidentd.conf b/main/oidentd/oidentd.conf
similarity index 100%
rename from extra/oidentd/oidentd.conf
rename to main/oidentd/oidentd.conf
diff --git a/extra/oidentd/oidentd.confd b/main/oidentd/oidentd.confd
similarity index 100%
rename from extra/oidentd/oidentd.confd
rename to main/oidentd/oidentd.confd
diff --git a/extra/oidentd/oidentd.initd b/main/oidentd/oidentd.initd
similarity index 100%
rename from extra/oidentd/oidentd.initd
rename to main/oidentd/oidentd.initd
diff --git a/extra/openldap/APKBUILD b/main/openldap/APKBUILD
similarity index 100%
rename from extra/openldap/APKBUILD
rename to main/openldap/APKBUILD
diff --git a/extra/openldap/openldap-2.4-ppolicy.patch b/main/openldap/openldap-2.4-ppolicy.patch
similarity index 100%
rename from extra/openldap/openldap-2.4-ppolicy.patch
rename to main/openldap/openldap-2.4-ppolicy.patch
diff --git a/extra/openldap/openldap-2.4.11-libldap_r.patch b/main/openldap/openldap-2.4.11-libldap_r.patch
similarity index 100%
rename from extra/openldap/openldap-2.4.11-libldap_r.patch
rename to main/openldap/openldap-2.4.11-libldap_r.patch
diff --git a/extra/openldap/openldap.post-install b/main/openldap/openldap.post-install
similarity index 100%
rename from extra/openldap/openldap.post-install
rename to main/openldap/openldap.post-install
diff --git a/extra/openldap/openldap.pre-install b/main/openldap/openldap.pre-install
similarity index 100%
rename from extra/openldap/openldap.pre-install
rename to main/openldap/openldap.pre-install
diff --git a/extra/openldap/slapd.confd b/main/openldap/slapd.confd
similarity index 100%
rename from extra/openldap/slapd.confd
rename to main/openldap/slapd.confd
diff --git a/extra/openldap/slapd.initd b/main/openldap/slapd.initd
similarity index 100%
rename from extra/openldap/slapd.initd
rename to main/openldap/slapd.initd
diff --git a/extra/openldap/slurpd.initd b/main/openldap/slurpd.initd
similarity index 100%
rename from extra/openldap/slurpd.initd
rename to main/openldap/slurpd.initd
diff --git a/extra/opennhrp/APKBUILD b/main/opennhrp/APKBUILD
similarity index 100%
rename from extra/opennhrp/APKBUILD
rename to main/opennhrp/APKBUILD
diff --git a/extra/opennhrp/opennhrp-0.9.2-fix-false-assert.patch b/main/opennhrp/opennhrp-0.9.2-fix-false-assert.patch
similarity index 100%
rename from extra/opennhrp/opennhrp-0.9.2-fix-false-assert.patch
rename to main/opennhrp/opennhrp-0.9.2-fix-false-assert.patch
diff --git a/extra/opennhrp/opennhrp-0.9.3-peer-up-bgp.patch b/main/opennhrp/opennhrp-0.9.3-peer-up-bgp.patch
similarity index 100%
rename from extra/opennhrp/opennhrp-0.9.3-peer-up-bgp.patch
rename to main/opennhrp/opennhrp-0.9.3-peer-up-bgp.patch
diff --git a/extra/opennhrp/opennhrp.confd b/main/opennhrp/opennhrp.confd
similarity index 100%
rename from extra/opennhrp/opennhrp.confd
rename to main/opennhrp/opennhrp.confd
diff --git a/extra/opennhrp/opennhrp.initd b/main/opennhrp/opennhrp.initd
similarity index 100%
rename from extra/opennhrp/opennhrp.initd
rename to main/opennhrp/opennhrp.initd
diff --git a/extra/openvpn/APKBUILD b/main/openvpn/APKBUILD
similarity index 100%
rename from extra/openvpn/APKBUILD
rename to main/openvpn/APKBUILD
diff --git a/extra/openvpn/openvpn-2.0.9-persistent.patch b/main/openvpn/openvpn-2.0.9-persistent.patch
similarity index 100%
rename from extra/openvpn/openvpn-2.0.9-persistent.patch
rename to main/openvpn/openvpn-2.0.9-persistent.patch
diff --git a/extra/openvpn/openvpn.initd b/main/openvpn/openvpn.initd
similarity index 100%
rename from extra/openvpn/openvpn.initd
rename to main/openvpn/openvpn.initd
diff --git a/extra/p7zip/APKBUILD b/main/p7zip/APKBUILD
similarity index 100%
rename from extra/p7zip/APKBUILD
rename to main/p7zip/APKBUILD
diff --git a/extra/p7zip/p7zip-cc-cxx.patch b/main/p7zip/p7zip-cc-cxx.patch
similarity index 100%
rename from extra/p7zip/p7zip-cc-cxx.patch
rename to main/p7zip/p7zip-cc-cxx.patch
diff --git a/extra/pciutils/APKBUILD b/main/pciutils/APKBUILD
similarity index 100%
rename from extra/pciutils/APKBUILD
rename to main/pciutils/APKBUILD
diff --git a/extra/pcmciautils/APKBUILD b/main/pcmciautils/APKBUILD
similarity index 100%
rename from extra/pcmciautils/APKBUILD
rename to main/pcmciautils/APKBUILD
diff --git a/extra/pcre/APKBUILD b/main/pcre/APKBUILD
similarity index 100%
rename from extra/pcre/APKBUILD
rename to main/pcre/APKBUILD
diff --git a/extra/perl-archive-zip/APKBUILD b/main/perl-archive-zip/APKBUILD
similarity index 100%
rename from extra/perl-archive-zip/APKBUILD
rename to main/perl-archive-zip/APKBUILD
diff --git a/extra/perl-convert-binhex/APKBUILD b/main/perl-convert-binhex/APKBUILD
similarity index 100%
rename from extra/perl-convert-binhex/APKBUILD
rename to main/perl-convert-binhex/APKBUILD
diff --git a/extra/perl-convert-tnef/APKBUILD b/main/perl-convert-tnef/APKBUILD
similarity index 100%
rename from extra/perl-convert-tnef/APKBUILD
rename to main/perl-convert-tnef/APKBUILD
diff --git a/extra/perl-convert-uulib/APKBUILD b/main/perl-convert-uulib/APKBUILD
similarity index 100%
rename from extra/perl-convert-uulib/APKBUILD
rename to main/perl-convert-uulib/APKBUILD
diff --git a/extra/perl-crypt-openssl-random/APKBUILD b/main/perl-crypt-openssl-random/APKBUILD
similarity index 100%
rename from extra/perl-crypt-openssl-random/APKBUILD
rename to main/perl-crypt-openssl-random/APKBUILD
diff --git a/extra/perl-crypt-openssl-rsa/APKBUILD b/main/perl-crypt-openssl-rsa/APKBUILD
similarity index 100%
rename from extra/perl-crypt-openssl-rsa/APKBUILD
rename to main/perl-crypt-openssl-rsa/APKBUILD
diff --git a/extra/perl-db/APKBUILD b/main/perl-db/APKBUILD
similarity index 100%
rename from extra/perl-db/APKBUILD
rename to main/perl-db/APKBUILD
diff --git a/extra/perl-db_file/APKBUILD b/main/perl-db_file/APKBUILD
similarity index 100%
rename from extra/perl-db_file/APKBUILD
rename to main/perl-db_file/APKBUILD
diff --git a/extra/perl-digest-sha1/APKBUILD b/main/perl-digest-sha1/APKBUILD
similarity index 100%
rename from extra/perl-digest-sha1/APKBUILD
rename to main/perl-digest-sha1/APKBUILD
diff --git a/extra/perl-getopt-long/APKBUILD b/main/perl-getopt-long/APKBUILD
similarity index 100%
rename from extra/perl-getopt-long/APKBUILD
rename to main/perl-getopt-long/APKBUILD
diff --git a/extra/perl-html-parser/APKBUILD b/main/perl-html-parser/APKBUILD
similarity index 100%
rename from extra/perl-html-parser/APKBUILD
rename to main/perl-html-parser/APKBUILD
diff --git a/extra/perl-inline/APKBUILD b/main/perl-inline/APKBUILD
similarity index 100%
rename from extra/perl-inline/APKBUILD
rename to main/perl-inline/APKBUILD
diff --git a/extra/perl-io-stringy/APKBUILD b/main/perl-io-stringy/APKBUILD
similarity index 100%
rename from extra/perl-io-stringy/APKBUILD
rename to main/perl-io-stringy/APKBUILD
diff --git a/extra/perl-mail-clamav/APKBUILD b/main/perl-mail-clamav/APKBUILD
similarity index 100%
rename from extra/perl-mail-clamav/APKBUILD
rename to main/perl-mail-clamav/APKBUILD
diff --git a/extra/perl-mail-dkim/APKBUILD b/main/perl-mail-dkim/APKBUILD
similarity index 100%
rename from extra/perl-mail-dkim/APKBUILD
rename to main/perl-mail-dkim/APKBUILD
diff --git a/extra/perl-mail-domainkeys/APKBUILD b/main/perl-mail-domainkeys/APKBUILD
similarity index 100%
rename from extra/perl-mail-domainkeys/APKBUILD
rename to main/perl-mail-domainkeys/APKBUILD
diff --git a/extra/perl-mail-spamassassin/APKBUILD b/main/perl-mail-spamassassin/APKBUILD
similarity index 100%
rename from extra/perl-mail-spamassassin/APKBUILD
rename to main/perl-mail-spamassassin/APKBUILD
diff --git a/extra/perl-mail-spf/APKBUILD b/main/perl-mail-spf/APKBUILD
similarity index 100%
rename from extra/perl-mail-spf/APKBUILD
rename to main/perl-mail-spf/APKBUILD
diff --git a/extra/perl-mail-tools/APKBUILD b/main/perl-mail-tools/APKBUILD
similarity index 100%
rename from extra/perl-mail-tools/APKBUILD
rename to main/perl-mail-tools/APKBUILD
diff --git a/extra/perl-mime-tools/APKBUILD b/main/perl-mime-tools/APKBUILD
similarity index 100%
rename from extra/perl-mime-tools/APKBUILD
rename to main/perl-mime-tools/APKBUILD
diff --git a/extra/perl-net-dns/APKBUILD b/main/perl-net-dns/APKBUILD
similarity index 100%
rename from extra/perl-net-dns/APKBUILD
rename to main/perl-net-dns/APKBUILD
diff --git a/extra/perl-net-ip/APKBUILD b/main/perl-net-ip/APKBUILD
similarity index 100%
rename from extra/perl-net-ip/APKBUILD
rename to main/perl-net-ip/APKBUILD
diff --git a/extra/perl-net-server/APKBUILD b/main/perl-net-server/APKBUILD
similarity index 100%
rename from extra/perl-net-server/APKBUILD
rename to main/perl-net-server/APKBUILD
diff --git a/extra/perl-parse-recdescent/APKBUILD b/main/perl-parse-recdescent/APKBUILD
similarity index 100%
rename from extra/perl-parse-recdescent/APKBUILD
rename to main/perl-parse-recdescent/APKBUILD
diff --git a/extra/perl-test-pod/APKBUILD b/main/perl-test-pod/APKBUILD
similarity index 100%
rename from extra/perl-test-pod/APKBUILD
rename to main/perl-test-pod/APKBUILD
diff --git a/extra/perl-time-date/APKBUILD b/main/perl-time-date/APKBUILD
similarity index 100%
rename from extra/perl-time-date/APKBUILD
rename to main/perl-time-date/APKBUILD
diff --git a/extra/perl-unix-syslog/APKBUILD b/main/perl-unix-syslog/APKBUILD
similarity index 100%
rename from extra/perl-unix-syslog/APKBUILD
rename to main/perl-unix-syslog/APKBUILD
diff --git a/extra/perl-uri-escape/APKBUILD b/main/perl-uri-escape/APKBUILD
similarity index 100%
rename from extra/perl-uri-escape/APKBUILD
rename to main/perl-uri-escape/APKBUILD
diff --git a/extra/perl-uri/APKBUILD b/main/perl-uri/APKBUILD
similarity index 100%
rename from extra/perl-uri/APKBUILD
rename to main/perl-uri/APKBUILD
diff --git a/extra/perl-xml-parser/APKBUILD b/main/perl-xml-parser/APKBUILD
similarity index 100%
rename from extra/perl-xml-parser/APKBUILD
rename to main/perl-xml-parser/APKBUILD
diff --git a/extra/perl-xml-simple/APKBUILD b/main/perl-xml-simple/APKBUILD
similarity index 100%
rename from extra/perl-xml-simple/APKBUILD
rename to main/perl-xml-simple/APKBUILD
diff --git a/extra/pgcluster/APKBUILD b/main/pgcluster/APKBUILD
similarity index 100%
rename from extra/pgcluster/APKBUILD
rename to main/pgcluster/APKBUILD
diff --git a/extra/pgcluster/pgcluster.confd b/main/pgcluster/pgcluster.confd
similarity index 100%
rename from extra/pgcluster/pgcluster.confd
rename to main/pgcluster/pgcluster.confd
diff --git a/extra/pgcluster/pgcluster.initd b/main/pgcluster/pgcluster.initd
similarity index 100%
rename from extra/pgcluster/pgcluster.initd
rename to main/pgcluster/pgcluster.initd
diff --git a/extra/pgpool/APKBUILD b/main/pgpool/APKBUILD
similarity index 100%
rename from extra/pgpool/APKBUILD
rename to main/pgpool/APKBUILD
diff --git a/extra/pgpool/pgpool.initd b/main/pgpool/pgpool.initd
similarity index 100%
rename from extra/pgpool/pgpool.initd
rename to main/pgpool/pgpool.initd
diff --git a/extra/php-apc/APKBUILD b/main/php-apc/APKBUILD
similarity index 100%
rename from extra/php-apc/APKBUILD
rename to main/php-apc/APKBUILD
diff --git a/extra/php-apc/apc.ini b/main/php-apc/apc.ini
similarity index 100%
rename from extra/php-apc/apc.ini
rename to main/php-apc/apc.ini
diff --git a/extra/php-fileinfo/APKBUILD b/main/php-fileinfo/APKBUILD
similarity index 100%
rename from extra/php-fileinfo/APKBUILD
rename to main/php-fileinfo/APKBUILD
diff --git a/extra/php-fileinfo/magic.patch b/main/php-fileinfo/magic.patch
similarity index 100%
rename from extra/php-fileinfo/magic.patch
rename to main/php-fileinfo/magic.patch
diff --git a/extra/php/APKBUILD b/main/php/APKBUILD
similarity index 100%
rename from extra/php/APKBUILD
rename to main/php/APKBUILD
diff --git a/extra/pinentry/APKBUILD b/main/pinentry/APKBUILD
similarity index 100%
rename from extra/pinentry/APKBUILD
rename to main/pinentry/APKBUILD
diff --git a/extra/pingu/APKBUILD b/main/pingu/APKBUILD
similarity index 100%
rename from extra/pingu/APKBUILD
rename to main/pingu/APKBUILD
diff --git a/extra/pingu/pingu.initd b/main/pingu/pingu.initd
similarity index 100%
rename from extra/pingu/pingu.initd
rename to main/pingu/pingu.initd
diff --git a/extra/portmap/APKBUILD b/main/portmap/APKBUILD
similarity index 100%
rename from extra/portmap/APKBUILD
rename to main/portmap/APKBUILD
diff --git a/extra/portmap/portmap-6.0-tcpd.patch b/main/portmap/portmap-6.0-tcpd.patch
similarity index 100%
rename from extra/portmap/portmap-6.0-tcpd.patch
rename to main/portmap/portmap-6.0-tcpd.patch
diff --git a/extra/portmap/portmap.confd b/main/portmap/portmap.confd
similarity index 100%
rename from extra/portmap/portmap.confd
rename to main/portmap/portmap.confd
diff --git a/extra/portmap/portmap.initd b/main/portmap/portmap.initd
similarity index 100%
rename from extra/portmap/portmap.initd
rename to main/portmap/portmap.initd
diff --git a/extra/portmap/portmap.pre-install b/main/portmap/portmap.pre-install
similarity index 100%
rename from extra/portmap/portmap.pre-install
rename to main/portmap/portmap.pre-install
diff --git a/extra/postfix/APKBUILD b/main/postfix/APKBUILD
similarity index 100%
rename from extra/postfix/APKBUILD
rename to main/postfix/APKBUILD
diff --git a/extra/postfix/dynamicmaps.cf b/main/postfix/dynamicmaps.cf
similarity index 100%
rename from extra/postfix/dynamicmaps.cf
rename to main/postfix/dynamicmaps.cf
diff --git a/extra/postfix/postfix-2.6.1-dynamicmaps.patch b/main/postfix/postfix-2.6.1-dynamicmaps.patch
similarity index 100%
rename from extra/postfix/postfix-2.6.1-dynamicmaps.patch
rename to main/postfix/postfix-2.6.1-dynamicmaps.patch
diff --git a/extra/postfix/postfix-ldap.post-install b/main/postfix/postfix-ldap.post-install
similarity index 100%
rename from extra/postfix/postfix-ldap.post-install
rename to main/postfix/postfix-ldap.post-install
diff --git a/extra/postfix/postfix-mysql.post-install b/main/postfix/postfix-mysql.post-install
similarity index 100%
rename from extra/postfix/postfix-mysql.post-install
rename to main/postfix/postfix-mysql.post-install
diff --git a/extra/postfix/postfix-pcre.post-install b/main/postfix/postfix-pcre.post-install
similarity index 100%
rename from extra/postfix/postfix-pcre.post-install
rename to main/postfix/postfix-pcre.post-install
diff --git a/extra/postfix/postfix-pgsql.post-install b/main/postfix/postfix-pgsql.post-install
similarity index 100%
rename from extra/postfix/postfix-pgsql.post-install
rename to main/postfix/postfix-pgsql.post-install
diff --git a/extra/postfix/postfix.initd b/main/postfix/postfix.initd
similarity index 100%
rename from extra/postfix/postfix.initd
rename to main/postfix/postfix.initd
diff --git a/extra/postfix/postfix.post-install b/main/postfix/postfix.post-install
similarity index 100%
rename from extra/postfix/postfix.post-install
rename to main/postfix/postfix.post-install
diff --git a/extra/postfix/postfix.pre-install b/main/postfix/postfix.pre-install
similarity index 100%
rename from extra/postfix/postfix.pre-install
rename to main/postfix/postfix.pre-install
diff --git a/extra/postgresql/APKBUILD b/main/postgresql/APKBUILD
similarity index 100%
rename from extra/postgresql/APKBUILD
rename to main/postgresql/APKBUILD
diff --git a/extra/postgresql/postgresql.confd b/main/postgresql/postgresql.confd
similarity index 100%
rename from extra/postgresql/postgresql.confd
rename to main/postgresql/postgresql.confd
diff --git a/extra/postgresql/postgresql.initd b/main/postgresql/postgresql.initd
similarity index 100%
rename from extra/postgresql/postgresql.initd
rename to main/postgresql/postgresql.initd
diff --git a/extra/pth/APKBUILD b/main/pth/APKBUILD
similarity index 100%
rename from extra/pth/APKBUILD
rename to main/pth/APKBUILD
diff --git a/extra/pth/pth-2.0.5-parallelfix.patch b/main/pth/pth-2.0.5-parallelfix.patch
similarity index 100%
rename from extra/pth/pth-2.0.5-parallelfix.patch
rename to main/pth/pth-2.0.5-parallelfix.patch
diff --git a/extra/pth/pth-2.0.6-ldflags.patch b/main/pth/pth-2.0.6-ldflags.patch
similarity index 100%
rename from extra/pth/pth-2.0.6-ldflags.patch
rename to main/pth/pth-2.0.6-ldflags.patch
diff --git a/extra/pth/pth-2.0.6-sigstack.patch b/main/pth/pth-2.0.6-sigstack.patch
similarity index 100%
rename from extra/pth/pth-2.0.6-sigstack.patch
rename to main/pth/pth-2.0.6-sigstack.patch
diff --git a/extra/python/APKBUILD b/main/python/APKBUILD
similarity index 100%
rename from extra/python/APKBUILD
rename to main/python/APKBUILD
diff --git a/extra/python/python-2.6-internal-expat.patch b/main/python/python-2.6-internal-expat.patch
similarity index 100%
rename from extra/python/python-2.6-internal-expat.patch
rename to main/python/python-2.6-internal-expat.patch
diff --git a/extra/quagga/APKBUILD b/main/quagga/APKBUILD
similarity index 100%
rename from extra/quagga/APKBUILD
rename to main/quagga/APKBUILD
diff --git a/extra/quagga/bgpd.initd b/main/quagga/bgpd.initd
similarity index 100%
rename from extra/quagga/bgpd.initd
rename to main/quagga/bgpd.initd
diff --git a/extra/quagga/ospf6d.initd b/main/quagga/ospf6d.initd
similarity index 100%
rename from extra/quagga/ospf6d.initd
rename to main/quagga/ospf6d.initd
diff --git a/extra/quagga/ospfd.initd b/main/quagga/ospfd.initd
similarity index 100%
rename from extra/quagga/ospfd.initd
rename to main/quagga/ospfd.initd
diff --git a/extra/quagga/quagga-0.99.11-del-routes.patch b/main/quagga/quagga-0.99.11-del-routes.patch
similarity index 100%
rename from extra/quagga/quagga-0.99.11-del-routes.patch
rename to main/quagga/quagga-0.99.11-del-routes.patch
diff --git a/extra/quagga/quagga-0.99.11-fd-leak.patch b/main/quagga/quagga-0.99.11-fd-leak.patch
similarity index 100%
rename from extra/quagga/quagga-0.99.11-fd-leak.patch
rename to main/quagga/quagga-0.99.11-fd-leak.patch
diff --git a/extra/quagga/quagga-0.99.11-ipv6-only.patch b/main/quagga/quagga-0.99.11-ipv6-only.patch
similarity index 100%
rename from extra/quagga/quagga-0.99.11-ipv6-only.patch
rename to main/quagga/quagga-0.99.11-ipv6-only.patch
diff --git a/extra/quagga/quagga-0.99.11-link-libcap.patch b/main/quagga/quagga-0.99.11-link-libcap.patch
similarity index 100%
rename from extra/quagga/quagga-0.99.11-link-libcap.patch
rename to main/quagga/quagga-0.99.11-link-libcap.patch
diff --git a/extra/quagga/quagga-0.99.11-zombie.patch b/main/quagga/quagga-0.99.11-zombie.patch
similarity index 100%
rename from extra/quagga/quagga-0.99.11-zombie.patch
rename to main/quagga/quagga-0.99.11-zombie.patch
diff --git a/extra/quagga/quagga.post-install b/main/quagga/quagga.post-install
similarity index 100%
rename from extra/quagga/quagga.post-install
rename to main/quagga/quagga.post-install
diff --git a/extra/quagga/quagga.pre-install b/main/quagga/quagga.pre-install
similarity index 100%
rename from extra/quagga/quagga.pre-install
rename to main/quagga/quagga.pre-install
diff --git a/extra/quagga/ripd.initd b/main/quagga/ripd.initd
similarity index 100%
rename from extra/quagga/ripd.initd
rename to main/quagga/ripd.initd
diff --git a/extra/quagga/ripngd.initd b/main/quagga/ripngd.initd
similarity index 100%
rename from extra/quagga/ripngd.initd
rename to main/quagga/ripngd.initd
diff --git a/extra/quagga/zebra.confd b/main/quagga/zebra.confd
similarity index 100%
rename from extra/quagga/zebra.confd
rename to main/quagga/zebra.confd
diff --git a/extra/quagga/zebra.initd b/main/quagga/zebra.initd
similarity index 100%
rename from extra/quagga/zebra.initd
rename to main/quagga/zebra.initd
diff --git a/extra/razor/APKBUILD b/main/razor/APKBUILD
similarity index 100%
rename from extra/razor/APKBUILD
rename to main/razor/APKBUILD
diff --git a/extra/roundcubemail/APKBUILD b/main/roundcubemail/APKBUILD
similarity index 100%
rename from extra/roundcubemail/APKBUILD
rename to main/roundcubemail/APKBUILD
diff --git a/extra/rrdtool/APKBUILD b/main/rrdtool/APKBUILD
similarity index 100%
rename from extra/rrdtool/APKBUILD
rename to main/rrdtool/APKBUILD
diff --git a/extra/rsync/APKBUILD b/main/rsync/APKBUILD
similarity index 100%
rename from extra/rsync/APKBUILD
rename to main/rsync/APKBUILD
diff --git a/extra/rsync/rsyncd.conf b/main/rsync/rsyncd.conf
similarity index 100%
rename from extra/rsync/rsyncd.conf
rename to main/rsync/rsyncd.conf
diff --git a/extra/rsync/rsyncd.confd b/main/rsync/rsyncd.confd
similarity index 100%
rename from extra/rsync/rsyncd.confd
rename to main/rsync/rsyncd.confd
diff --git a/extra/rsync/rsyncd.initd b/main/rsync/rsyncd.initd
similarity index 100%
rename from extra/rsync/rsyncd.initd
rename to main/rsync/rsyncd.initd
diff --git a/extra/rsync/rsyncd.logrotate b/main/rsync/rsyncd.logrotate
similarity index 100%
rename from extra/rsync/rsyncd.logrotate
rename to main/rsync/rsyncd.logrotate
diff --git a/extra/ruby/APKBUILD b/main/ruby/APKBUILD
similarity index 100%
rename from extra/ruby/APKBUILD
rename to main/ruby/APKBUILD
diff --git a/extra/rubygems/APKBUILD b/main/rubygems/APKBUILD
similarity index 100%
rename from extra/rubygems/APKBUILD
rename to main/rubygems/APKBUILD
diff --git a/extra/rubygems/rubygems-1.3.1-setup.patch b/main/rubygems/rubygems-1.3.1-setup.patch
similarity index 100%
rename from extra/rubygems/rubygems-1.3.1-setup.patch
rename to main/rubygems/rubygems-1.3.1-setup.patch
diff --git a/extra/run-parts/APKBUILD b/main/run-parts/APKBUILD
similarity index 100%
rename from extra/run-parts/APKBUILD
rename to main/run-parts/APKBUILD
diff --git a/extra/samba/APKBUILD b/main/samba/APKBUILD
similarity index 100%
rename from extra/samba/APKBUILD
rename to main/samba/APKBUILD
diff --git a/extra/samba/samba.confd b/main/samba/samba.confd
similarity index 100%
rename from extra/samba/samba.confd
rename to main/samba/samba.confd
diff --git a/extra/samba/samba.initd b/main/samba/samba.initd
similarity index 100%
rename from extra/samba/samba.initd
rename to main/samba/samba.initd
diff --git a/extra/screen/APKBUILD b/main/screen/APKBUILD
similarity index 100%
rename from extra/screen/APKBUILD
rename to main/screen/APKBUILD
diff --git a/extra/screen/screen-4.0.3.patch b/main/screen/screen-4.0.3.patch
similarity index 100%
rename from extra/screen/screen-4.0.3.patch
rename to main/screen/screen-4.0.3.patch
diff --git a/extra/sed/APKBUILD b/main/sed/APKBUILD
similarity index 100%
rename from extra/sed/APKBUILD
rename to main/sed/APKBUILD
diff --git a/extra/sed/sed.post-deinstall b/main/sed/sed.post-deinstall
similarity index 100%
rename from extra/sed/sed.post-deinstall
rename to main/sed/sed.post-deinstall
diff --git a/extra/sfic/APKBUILD b/main/sfic/APKBUILD
similarity index 100%
rename from extra/sfic/APKBUILD
rename to main/sfic/APKBUILD
diff --git a/extra/sfic/sfic-0.1.7-signal.patch b/main/sfic/sfic-0.1.7-signal.patch
similarity index 100%
rename from extra/sfic/sfic-0.1.7-signal.patch
rename to main/sfic/sfic-0.1.7-signal.patch
diff --git a/extra/shorewall-common/APKBUILD b/main/shorewall-common/APKBUILD
similarity index 100%
rename from extra/shorewall-common/APKBUILD
rename to main/shorewall-common/APKBUILD
diff --git a/extra/shorewall-common/shorewall.initd b/main/shorewall-common/shorewall.initd
similarity index 100%
rename from extra/shorewall-common/shorewall.initd
rename to main/shorewall-common/shorewall.initd
diff --git a/extra/shorewall-lite/APKBUILD b/main/shorewall-lite/APKBUILD
similarity index 100%
rename from extra/shorewall-lite/APKBUILD
rename to main/shorewall-lite/APKBUILD
diff --git a/extra/shorewall-lite/shorewall-lite.initd b/main/shorewall-lite/shorewall-lite.initd
similarity index 100%
rename from extra/shorewall-lite/shorewall-lite.initd
rename to main/shorewall-lite/shorewall-lite.initd
diff --git a/extra/shorewall-perl/APKBUILD b/main/shorewall-perl/APKBUILD
similarity index 100%
rename from extra/shorewall-perl/APKBUILD
rename to main/shorewall-perl/APKBUILD
diff --git a/extra/shorewall-shell/APKBUILD b/main/shorewall-shell/APKBUILD
similarity index 100%
rename from extra/shorewall-shell/APKBUILD
rename to main/shorewall-shell/APKBUILD
diff --git a/extra/shorewall/APKBUILD b/main/shorewall/APKBUILD
similarity index 100%
rename from extra/shorewall/APKBUILD
rename to main/shorewall/APKBUILD
diff --git a/extra/sic/APKBUILD b/main/sic/APKBUILD
similarity index 100%
rename from extra/sic/APKBUILD
rename to main/sic/APKBUILD
diff --git a/extra/slang/APKBUILD b/main/slang/APKBUILD
similarity index 100%
rename from extra/slang/APKBUILD
rename to main/slang/APKBUILD
diff --git a/extra/slang/slang-2.1.3-uclibc.patch b/main/slang/slang-2.1.3-uclibc.patch
similarity index 100%
rename from extra/slang/slang-2.1.3-uclibc.patch
rename to main/slang/slang-2.1.3-uclibc.patch
diff --git a/extra/snort/APKBUILD b/main/snort/APKBUILD
similarity index 100%
rename from extra/snort/APKBUILD
rename to main/snort/APKBUILD
diff --git a/extra/snort/nocxx.patch b/main/snort/nocxx.patch
similarity index 100%
rename from extra/snort/nocxx.patch
rename to main/snort/nocxx.patch
diff --git a/extra/snort/snort.confd b/main/snort/snort.confd
similarity index 100%
rename from extra/snort/snort.confd
rename to main/snort/snort.confd
diff --git a/extra/snort/snort.initd b/main/snort/snort.initd
similarity index 100%
rename from extra/snort/snort.initd
rename to main/snort/snort.initd
diff --git a/extra/snort/snort.pre-install b/main/snort/snort.pre-install
similarity index 100%
rename from extra/snort/snort.pre-install
rename to main/snort/snort.pre-install
diff --git a/extra/sntpc/APKBUILD b/main/sntpc/APKBUILD
similarity index 100%
rename from extra/sntpc/APKBUILD
rename to main/sntpc/APKBUILD
diff --git a/extra/sntpc/sntpc.confd b/main/sntpc/sntpc.confd
similarity index 100%
rename from extra/sntpc/sntpc.confd
rename to main/sntpc/sntpc.confd
diff --git a/extra/sntpc/sntpc.initd b/main/sntpc/sntpc.initd
similarity index 100%
rename from extra/sntpc/sntpc.initd
rename to main/sntpc/sntpc.initd
diff --git a/extra/spamassassin/APKBUILD b/main/spamassassin/APKBUILD
similarity index 100%
rename from extra/spamassassin/APKBUILD
rename to main/spamassassin/APKBUILD
diff --git a/extra/spamassassin/spamd.conf b/main/spamassassin/spamd.conf
similarity index 100%
rename from extra/spamassassin/spamd.conf
rename to main/spamassassin/spamd.conf
diff --git a/extra/spamassassin/spamd.init b/main/spamassassin/spamd.init
similarity index 100%
rename from extra/spamassassin/spamd.init
rename to main/spamassassin/spamd.init
diff --git a/extra/sqlite/APKBUILD b/main/sqlite/APKBUILD
similarity index 100%
rename from extra/sqlite/APKBUILD
rename to main/sqlite/APKBUILD
diff --git a/extra/sqlite/license.txt b/main/sqlite/license.txt
similarity index 100%
rename from extra/sqlite/license.txt
rename to main/sqlite/license.txt
diff --git a/extra/squid/APKBUILD b/main/squid/APKBUILD
similarity index 100%
rename from extra/squid/APKBUILD
rename to main/squid/APKBUILD
diff --git a/extra/squid/squid-2.7-gentoo.patch b/main/squid/squid-2.7-gentoo.patch
similarity index 100%
rename from extra/squid/squid-2.7-gentoo.patch
rename to main/squid/squid-2.7-gentoo.patch
diff --git a/extra/squid/squid.confd b/main/squid/squid.confd
similarity index 100%
rename from extra/squid/squid.confd
rename to main/squid/squid.confd
diff --git a/extra/squid/squid.initd b/main/squid/squid.initd
similarity index 100%
rename from extra/squid/squid.initd
rename to main/squid/squid.initd
diff --git a/extra/squid/squid.logrotate b/main/squid/squid.logrotate
similarity index 100%
rename from extra/squid/squid.logrotate
rename to main/squid/squid.logrotate
diff --git a/extra/squid/squid.post-install b/main/squid/squid.post-install
similarity index 100%
rename from extra/squid/squid.post-install
rename to main/squid/squid.post-install
diff --git a/extra/ssmtp/APKBUILD b/main/ssmtp/APKBUILD
similarity index 100%
rename from extra/ssmtp/APKBUILD
rename to main/ssmtp/APKBUILD
diff --git a/extra/ssmtp/CVE-2008-3962.patch b/main/ssmtp/CVE-2008-3962.patch
similarity index 100%
rename from extra/ssmtp/CVE-2008-3962.patch
rename to main/ssmtp/CVE-2008-3962.patch
diff --git a/extra/ssmtp/generate_config.patch b/main/ssmtp/generate_config.patch
similarity index 100%
rename from extra/ssmtp/generate_config.patch
rename to main/ssmtp/generate_config.patch
diff --git a/extra/strace/APKBUILD b/main/strace/APKBUILD
similarity index 100%
rename from extra/strace/APKBUILD
rename to main/strace/APKBUILD
diff --git a/extra/subversion/APKBUILD b/main/subversion/APKBUILD
similarity index 100%
rename from extra/subversion/APKBUILD
rename to main/subversion/APKBUILD
diff --git a/extra/subversion/subversion.pre-install b/main/subversion/subversion.pre-install
similarity index 100%
rename from extra/subversion/subversion.pre-install
rename to main/subversion/subversion.pre-install
diff --git a/extra/subversion/svnserve.confd b/main/subversion/svnserve.confd
similarity index 100%
rename from extra/subversion/svnserve.confd
rename to main/subversion/svnserve.confd
diff --git a/extra/subversion/svnserve.initd b/main/subversion/svnserve.initd
similarity index 100%
rename from extra/subversion/svnserve.initd
rename to main/subversion/svnserve.initd
diff --git a/extra/sysfsutils/APKBUILD b/main/sysfsutils/APKBUILD
similarity index 100%
rename from extra/sysfsutils/APKBUILD
rename to main/sysfsutils/APKBUILD
diff --git a/extra/sysklogd/APKBUILD b/main/sysklogd/APKBUILD
similarity index 100%
rename from extra/sysklogd/APKBUILD
rename to main/sysklogd/APKBUILD
diff --git a/extra/sysklogd/LICENSE b/main/sysklogd/LICENSE
similarity index 100%
rename from extra/sysklogd/LICENSE
rename to main/sysklogd/LICENSE
diff --git a/extra/sysklogd/sysklogd-1.4.2-caen-owl-klogd-drop-root.diff b/main/sysklogd/sysklogd-1.4.2-caen-owl-klogd-drop-root.diff
similarity index 100%
rename from extra/sysklogd/sysklogd-1.4.2-caen-owl-klogd-drop-root.diff
rename to main/sysklogd/sysklogd-1.4.2-caen-owl-klogd-drop-root.diff
diff --git a/extra/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-bind.diff b/main/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-bind.diff
similarity index 100%
rename from extra/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-bind.diff
rename to main/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-bind.diff
diff --git a/extra/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff b/main/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff
similarity index 100%
rename from extra/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff
rename to main/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff
diff --git a/extra/sysklogd/sysklogd-1.5-build.patch b/main/sysklogd/sysklogd-1.5-build.patch
similarity index 100%
rename from extra/sysklogd/sysklogd-1.5-build.patch
rename to main/sysklogd/sysklogd-1.5-build.patch
diff --git a/extra/sysklogd/sysklogd.confd b/main/sysklogd/sysklogd.confd
similarity index 100%
rename from extra/sysklogd/sysklogd.confd
rename to main/sysklogd/sysklogd.confd
diff --git a/extra/sysklogd/sysklogd.initd b/main/sysklogd/sysklogd.initd
similarity index 100%
rename from extra/sysklogd/sysklogd.initd
rename to main/sysklogd/sysklogd.initd
diff --git a/extra/sysklogd/sysklogd.logrotate b/main/sysklogd/sysklogd.logrotate
similarity index 100%
rename from extra/sysklogd/sysklogd.logrotate
rename to main/sysklogd/sysklogd.logrotate
diff --git a/extra/sysstat/APKBUILD b/main/sysstat/APKBUILD
similarity index 100%
rename from extra/sysstat/APKBUILD
rename to main/sysstat/APKBUILD
diff --git a/extra/tar/APKBUILD b/main/tar/APKBUILD
similarity index 100%
rename from extra/tar/APKBUILD
rename to main/tar/APKBUILD
diff --git a/extra/tar/tar.post-deinstall b/main/tar/tar.post-deinstall
similarity index 100%
rename from extra/tar/tar.post-deinstall
rename to main/tar/tar.post-deinstall
diff --git a/extra/tcl/APKBUILD b/main/tcl/APKBUILD
similarity index 100%
rename from extra/tcl/APKBUILD
rename to main/tcl/APKBUILD
diff --git a/extra/tcpdump/APKBUILD b/main/tcpdump/APKBUILD
similarity index 100%
rename from extra/tcpdump/APKBUILD
rename to main/tcpdump/APKBUILD
diff --git a/extra/tcpproxy/APKBUILD b/main/tcpproxy/APKBUILD
similarity index 77%
rename from extra/tcpproxy/APKBUILD
rename to main/tcpproxy/APKBUILD
index fb7d1226d7cb..a06aacb39a66 100644
--- a/extra/tcpproxy/APKBUILD
+++ b/main/tcpproxy/APKBUILD
@@ -1,19 +1,20 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
pkgname=tcpproxy
-pkgver=2.0.0-beta15
+pkgver=2.0.0_beta15
+_realver=2.0.0-beta15
pkgrel=0
pkgdesc="Transparent TCP Proxy"
url="http://www.quietsche-entchen.de/cgi-bin/wiki.cgi/proxies/TcpProxy"
license="GPL"
-depends="uclibc"
+depends=
makedepends="ctags"
install=""
subpackages=""
-source="http://www.quietsche-entchen.de/download/$pkgname-$pkgver.tar.gz
+source="http://www.quietsche-entchen.de/download/$pkgname-$_realver.tar.gz
tcpproxy.initd"
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$srcdir/$pkgname-$_realver"
make || return 1
diff --git a/extra/tcpproxy/tcpproxy.initd b/main/tcpproxy/tcpproxy.initd
similarity index 100%
rename from extra/tcpproxy/tcpproxy.initd
rename to main/tcpproxy/tcpproxy.initd
diff --git a/extra/tiff/APKBUILD b/main/tiff/APKBUILD
similarity index 100%
rename from extra/tiff/APKBUILD
rename to main/tiff/APKBUILD
diff --git a/extra/tinyproxy/APKBUILD b/main/tinyproxy/APKBUILD
similarity index 100%
rename from extra/tinyproxy/APKBUILD
rename to main/tinyproxy/APKBUILD
diff --git a/extra/tinyproxy/tinyproxy.initd b/main/tinyproxy/tinyproxy.initd
similarity index 100%
rename from extra/tinyproxy/tinyproxy.initd
rename to main/tinyproxy/tinyproxy.initd
diff --git a/extra/tinyproxy/tinyproxy.install b/main/tinyproxy/tinyproxy.install
similarity index 100%
rename from extra/tinyproxy/tinyproxy.install
rename to main/tinyproxy/tinyproxy.install
diff --git a/extra/tmux/APKBUILD b/main/tmux/APKBUILD
similarity index 100%
rename from extra/tmux/APKBUILD
rename to main/tmux/APKBUILD
diff --git a/extra/tmux/build.patch b/main/tmux/build.patch
similarity index 100%
rename from extra/tmux/build.patch
rename to main/tmux/build.patch
diff --git a/extra/transmission/APKBUILD b/main/transmission/APKBUILD
similarity index 100%
rename from extra/transmission/APKBUILD
rename to main/transmission/APKBUILD
diff --git a/extra/transmission/transmission-daemon.confd b/main/transmission/transmission-daemon.confd
similarity index 100%
rename from extra/transmission/transmission-daemon.confd
rename to main/transmission/transmission-daemon.confd
diff --git a/extra/transmission/transmission-daemon.initd b/main/transmission/transmission-daemon.initd
similarity index 100%
rename from extra/transmission/transmission-daemon.initd
rename to main/transmission/transmission-daemon.initd
diff --git a/extra/transmission/transmission.pre-install b/main/transmission/transmission.pre-install
similarity index 100%
rename from extra/transmission/transmission.pre-install
rename to main/transmission/transmission.pre-install
diff --git a/extra/udev/APKBUILD b/main/udev/APKBUILD
similarity index 100%
rename from extra/udev/APKBUILD
rename to main/udev/APKBUILD
diff --git a/extra/udev/move_tmp_persistent_rules.sh b/main/udev/move_tmp_persistent_rules.sh
similarity index 100%
rename from extra/udev/move_tmp_persistent_rules.sh
rename to main/udev/move_tmp_persistent_rules.sh
diff --git a/extra/udev/udev-mount.initd b/main/udev/udev-mount.initd
similarity index 100%
rename from extra/udev/udev-mount.initd
rename to main/udev/udev-mount.initd
diff --git a/extra/udev/udev-postmount.initd b/main/udev/udev-postmount.initd
similarity index 100%
rename from extra/udev/udev-postmount.initd
rename to main/udev/udev-postmount.initd
diff --git a/extra/udev/udev-start.sh b/main/udev/udev-start.sh
similarity index 100%
rename from extra/udev/udev-start.sh
rename to main/udev/udev-start.sh
diff --git a/extra/udev/udev.initd b/main/udev/udev.initd
similarity index 100%
rename from extra/udev/udev.initd
rename to main/udev/udev.initd
diff --git a/extra/udev/write_root_link_rule b/main/udev/write_root_link_rule
similarity index 100%
rename from extra/udev/write_root_link_rule
rename to main/udev/write_root_link_rule
diff --git a/extra/uiconv/APKBUILD b/main/uiconv/APKBUILD
similarity index 100%
rename from extra/uiconv/APKBUILD
rename to main/uiconv/APKBUILD
diff --git a/extra/unarj/APKBUILD b/main/unarj/APKBUILD
similarity index 100%
rename from extra/unarj/APKBUILD
rename to main/unarj/APKBUILD
diff --git a/extra/unfs3/APKBUILD b/main/unfs3/APKBUILD
similarity index 100%
rename from extra/unfs3/APKBUILD
rename to main/unfs3/APKBUILD
diff --git a/extra/unixodbc/APKBUILD b/main/unixodbc/APKBUILD
similarity index 100%
rename from extra/unixodbc/APKBUILD
rename to main/unixodbc/APKBUILD
diff --git a/extra/unrar/APKBUILD b/main/unrar/APKBUILD
similarity index 100%
rename from extra/unrar/APKBUILD
rename to main/unrar/APKBUILD
diff --git a/extra/usbutils/APKBUILD b/main/usbutils/APKBUILD
similarity index 100%
rename from extra/usbutils/APKBUILD
rename to main/usbutils/APKBUILD
diff --git a/extra/v86d/APKBUILD b/main/v86d/APKBUILD
similarity index 100%
rename from extra/v86d/APKBUILD
rename to main/v86d/APKBUILD
diff --git a/extra/v86d/modprobe.uvesafb b/main/v86d/modprobe.uvesafb
similarity index 100%
rename from extra/v86d/modprobe.uvesafb
rename to main/v86d/modprobe.uvesafb
diff --git a/extra/vala/APKBUILD b/main/vala/APKBUILD
similarity index 100%
rename from extra/vala/APKBUILD
rename to main/vala/APKBUILD
diff --git a/extra/valgrind/APKBUILD b/main/valgrind/APKBUILD
similarity index 100%
rename from extra/valgrind/APKBUILD
rename to main/valgrind/APKBUILD
diff --git a/extra/valgrind/valgrind-3.4.0-uclibc.patch b/main/valgrind/valgrind-3.4.0-uclibc.patch
similarity index 100%
rename from extra/valgrind/valgrind-3.4.0-uclibc.patch
rename to main/valgrind/valgrind-3.4.0-uclibc.patch
diff --git a/extra/vim/APKBUILD b/main/vim/APKBUILD
similarity index 100%
rename from extra/vim/APKBUILD
rename to main/vim/APKBUILD
diff --git a/extra/vim/vimrc b/main/vim/vimrc
similarity index 100%
rename from extra/vim/vimrc
rename to main/vim/vimrc
diff --git a/extra/vsftpd/APKBUILD b/main/vsftpd/APKBUILD
similarity index 100%
rename from extra/vsftpd/APKBUILD
rename to main/vsftpd/APKBUILD
diff --git a/extra/vsftpd/vsftpd-enable-ssl.patch b/main/vsftpd/vsftpd-enable-ssl.patch
similarity index 100%
rename from extra/vsftpd/vsftpd-enable-ssl.patch
rename to main/vsftpd/vsftpd-enable-ssl.patch
diff --git a/extra/vsftpd/vsftpd.confd b/main/vsftpd/vsftpd.confd
similarity index 100%
rename from extra/vsftpd/vsftpd.confd
rename to main/vsftpd/vsftpd.confd
diff --git a/extra/vsftpd/vsftpd.initd b/main/vsftpd/vsftpd.initd
similarity index 100%
rename from extra/vsftpd/vsftpd.initd
rename to main/vsftpd/vsftpd.initd
diff --git a/extra/wget/APKBUILD b/main/wget/APKBUILD
similarity index 100%
rename from extra/wget/APKBUILD
rename to main/wget/APKBUILD
diff --git a/extra/wget/wget.post-deinstall b/main/wget/wget.post-deinstall
similarity index 100%
rename from extra/wget/wget.post-deinstall
rename to main/wget/wget.post-deinstall
diff --git a/extra/xvidcore/APKBUILD b/main/xvidcore/APKBUILD
similarity index 100%
rename from extra/xvidcore/APKBUILD
rename to main/xvidcore/APKBUILD
diff --git a/extra/zip/10-zip-3.0-build.patch b/main/zip/10-zip-3.0-build.patch
similarity index 100%
rename from extra/zip/10-zip-3.0-build.patch
rename to main/zip/10-zip-3.0-build.patch
diff --git a/extra/zip/20-zip-3.0-exec-stack.patch b/main/zip/20-zip-3.0-exec-stack.patch
similarity index 100%
rename from extra/zip/20-zip-3.0-exec-stack.patch
rename to main/zip/20-zip-3.0-exec-stack.patch
diff --git a/extra/zip/30-zip-3.0-pic.patch b/main/zip/30-zip-3.0-pic.patch
similarity index 100%
rename from extra/zip/30-zip-3.0-pic.patch
rename to main/zip/30-zip-3.0-pic.patch
diff --git a/extra/zip/APKBUILD b/main/zip/APKBUILD
similarity index 100%
rename from extra/zip/APKBUILD
rename to main/zip/APKBUILD
diff --git a/extra/zonenotify/APKBUILD b/main/zonenotify/APKBUILD
similarity index 100%
rename from extra/zonenotify/APKBUILD
rename to main/zonenotify/APKBUILD
--
GitLab