diff --git a/packages/armadillo/armadillo.mk b/packages/armadillo/armadillo.mk new file mode 100644 index 0000000..4febdb5 --- /dev/null +++ b/packages/armadillo/armadillo.mk @@ -0,0 +1,20 @@ +ARMADILLO_PKGDIR = $(TARGET)/armadillo + +armadillo-install: armadillo-build + mkdir -p $(ARMADILLO_PKGDIR) + + mkdir -p $(ARMADILLO_PKGDIR)/bin/ + $(MAKE) -C packages/armadillo/src install DESTDIR=$(CURDIR)/$(ARMADILLO_PKGDIR) + + $(call COPYTREE, packages/armadillo/tokens, $(ARMADILLO_PKGDIR)/tokens) + + $(call COPYTREE, packages/armadillo/service, $(ARMADILLO_PKGDIR)/service) + +armadillo-clean: + rm -rf $(ARMADILLO_PKGDIR) + $(MAKE) -C packages/armadillo/src clean + +armadillo-build: + $(MAKE) -C packages/armadillo/src build + +PACKAGES += armadillo diff --git a/packages/pwnables/service/pwnables/finish b/packages/armadillo/service/pwnables/finish similarity index 100% rename from packages/pwnables/service/pwnables/finish rename to packages/armadillo/service/pwnables/finish diff --git a/packages/pwnables/service/pwnables/ip.txt b/packages/armadillo/service/pwnables/ip.txt similarity index 100% rename from packages/pwnables/service/pwnables/ip.txt rename to packages/armadillo/service/pwnables/ip.txt diff --git a/packages/pwnables/service/pwnables/log/run b/packages/armadillo/service/pwnables/log/run similarity index 100% rename from packages/pwnables/service/pwnables/log/run rename to packages/armadillo/service/pwnables/log/run diff --git a/packages/pwnables/service/pwnables/motd b/packages/armadillo/service/pwnables/motd similarity index 100% rename from packages/pwnables/service/pwnables/motd rename to packages/armadillo/service/pwnables/motd diff --git a/packages/pwnables/service/pwnables/pwnie b/packages/armadillo/service/pwnables/pwnie similarity index 100% rename from packages/pwnables/service/pwnables/pwnie rename to packages/armadillo/service/pwnables/pwnie diff --git a/packages/pwnables/service/pwnables/run b/packages/armadillo/service/pwnables/run similarity index 100% rename from packages/pwnables/service/pwnables/run rename to packages/armadillo/service/pwnables/run diff --git a/packages/pwnables/src/Makefile b/packages/armadillo/src/Makefile similarity index 72% rename from packages/pwnables/src/Makefile rename to packages/armadillo/src/Makefile index 6f2454d..659f710 100644 --- a/packages/pwnables/src/Makefile +++ b/packages/armadillo/src/Makefile @@ -1,5 +1,5 @@ CFLAGS = -Wall -Werror -TARGETS = gimmie ltraceme straceme killme +TARGETS = gimmie straceme killme all: build @@ -7,7 +7,6 @@ build: $(TARGETS) gimmie: gimmie.o token.o arc4.o octopus: octopus.o token.o arc4.o -ltraceme: ltraceme.o token.o arc4.o straceme: straceme.o token.o arc4.o killme: killme.o token.o arc4.o diff --git a/packages/pwnables/src/arc4.c b/packages/armadillo/src/arc4.c similarity index 100% rename from packages/pwnables/src/arc4.c rename to packages/armadillo/src/arc4.c diff --git a/packages/pwnables/src/arc4.h b/packages/armadillo/src/arc4.h similarity index 100% rename from packages/pwnables/src/arc4.h rename to packages/armadillo/src/arc4.h diff --git a/packages/pwnables/src/gimmie.c b/packages/armadillo/src/gimmie.c similarity index 91% rename from packages/pwnables/src/gimmie.c rename to packages/armadillo/src/gimmie.c index fe7fbd8..bdf56f2 100644 --- a/packages/pwnables/src/gimmie.c +++ b/packages/armadillo/src/gimmie.c @@ -1,6 +1,4 @@ #include -#include -#include #include #include "token.h" diff --git a/packages/pwnables/src/killme.c b/packages/armadillo/src/killme.c similarity index 100% rename from packages/pwnables/src/killme.c rename to packages/armadillo/src/killme.c diff --git a/packages/pwnables/src/straceme.c b/packages/armadillo/src/straceme.c similarity index 100% rename from packages/pwnables/src/straceme.c rename to packages/armadillo/src/straceme.c diff --git a/packages/pwnables/src/token.c b/packages/armadillo/src/token.c similarity index 100% rename from packages/pwnables/src/token.c rename to packages/armadillo/src/token.c diff --git a/packages/pwnables/src/token.h b/packages/armadillo/src/token.h similarity index 100% rename from packages/pwnables/src/token.h rename to packages/armadillo/src/token.h diff --git a/packages/pwnables/tokens/gimmie/category b/packages/armadillo/tokens/gimmie/category similarity index 100% rename from packages/pwnables/tokens/gimmie/category rename to packages/armadillo/tokens/gimmie/category diff --git a/packages/pwnables/tokens/gimmie/category.key b/packages/armadillo/tokens/gimmie/category.key similarity index 100% rename from packages/pwnables/tokens/gimmie/category.key rename to packages/armadillo/tokens/gimmie/category.key diff --git a/packages/pwnables/tokens/gimmie/enc.key b/packages/armadillo/tokens/gimmie/enc.key similarity index 100% rename from packages/pwnables/tokens/gimmie/enc.key rename to packages/armadillo/tokens/gimmie/enc.key diff --git a/packages/pwnables/tokens/killme/category b/packages/armadillo/tokens/killme/category similarity index 100% rename from packages/pwnables/tokens/killme/category rename to packages/armadillo/tokens/killme/category diff --git a/packages/pwnables/tokens/killme/category.key b/packages/armadillo/tokens/killme/category.key similarity index 100% rename from packages/pwnables/tokens/killme/category.key rename to packages/armadillo/tokens/killme/category.key diff --git a/packages/pwnables/tokens/killme/enc.key b/packages/armadillo/tokens/killme/enc.key similarity index 100% rename from packages/pwnables/tokens/killme/enc.key rename to packages/armadillo/tokens/killme/enc.key diff --git a/packages/pwnables/tokens/ltraceme/category b/packages/armadillo/tokens/ltraceme/category similarity index 100% rename from packages/pwnables/tokens/ltraceme/category rename to packages/armadillo/tokens/ltraceme/category diff --git a/packages/pwnables/tokens/ltraceme/category.key b/packages/armadillo/tokens/ltraceme/category.key similarity index 100% rename from packages/pwnables/tokens/ltraceme/category.key rename to packages/armadillo/tokens/ltraceme/category.key diff --git a/packages/pwnables/tokens/ltraceme/enc.key b/packages/armadillo/tokens/ltraceme/enc.key similarity index 100% rename from packages/pwnables/tokens/ltraceme/enc.key rename to packages/armadillo/tokens/ltraceme/enc.key diff --git a/packages/pwnables/tokens/straceme/category b/packages/armadillo/tokens/straceme/category similarity index 100% rename from packages/pwnables/tokens/straceme/category rename to packages/armadillo/tokens/straceme/category diff --git a/packages/pwnables/tokens/straceme/category.key b/packages/armadillo/tokens/straceme/category.key similarity index 100% rename from packages/pwnables/tokens/straceme/category.key rename to packages/armadillo/tokens/straceme/category.key diff --git a/packages/pwnables/tokens/straceme/enc.key b/packages/armadillo/tokens/straceme/enc.key similarity index 100% rename from packages/pwnables/tokens/straceme/enc.key rename to packages/armadillo/tokens/straceme/enc.key diff --git a/packages/pwnables/pwnables.mk b/packages/pwnables/pwnables.mk deleted file mode 100644 index 873192b..0000000 --- a/packages/pwnables/pwnables.mk +++ /dev/null @@ -1,20 +0,0 @@ -PWNABLES_PKGDIR = $(TARGET)/pwnables - -pwnables-install: pwnables-build - mkdir -p $(PWNABLES_PKGDIR) - - mkdir -p $(PWNABLES_PKGDIR)/bin/ - $(MAKE) -C packages/pwnables/src install DESTDIR=$(CURDIR)/$(PWNABLES_PKGDIR) - - $(call COPYTREE, packages/pwnables/tokens, $(PWNABLES_PKGDIR)/tokens) - - $(call COPYTREE, packages/pwnables/service, $(PWNABLES_PKGDIR)/service) - -pwnables-clean: - rm -rf $(PWNABLES_PKGDIR) - $(MAKE) -C packages/pwnables/src clean - -pwnables-build: - $(MAKE) -C packages/pwnables/src build - -PACKAGES += pwnables