From 37e4aa0b4f6cdd1fcfc28a26cc0fed1cbf1aec59 Mon Sep 17 00:00:00 2001 From: Galen Wolfe-Pauly Date: Wed, 2 Sep 2015 11:17:41 -0700 Subject: [PATCH 1/6] contributing link, and why not .md? --- README.markdown => README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) rename README.markdown => README.md (96%) diff --git a/README.markdown b/README.md similarity index 96% rename from README.markdown rename to README.md index ade8523d4..905359cb0 100644 --- a/README.markdown +++ b/README.md @@ -208,5 +208,6 @@ pier. Your original ticket will still work. Contributing ------------ -If you're interested in contributing to urbit development come and -`:talk` with us. We'll help you get oriented and up to speed. +The first step in contributing to urbit is to come and join us on `:talk`. +For more detailed instructions check out +[`contributing.md`](https://github.com/urbit/urbit/blob/master/CONTRIBUTING.md). From 09123011f5e464791c80d8a01748feb128311863 Mon Sep 17 00:00:00 2001 From: Galen Wolfe-Pauly Date: Wed, 2 Sep 2015 11:32:15 -0700 Subject: [PATCH 2/6] formatting --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 905359cb0..5947a1396 100644 --- a/README.md +++ b/README.md @@ -209,5 +209,6 @@ Contributing ------------ The first step in contributing to urbit is to come and join us on `:talk`. + For more detailed instructions check out -[`contributing.md`](https://github.com/urbit/urbit/blob/master/CONTRIBUTING.md). +[`contributing.md`](https://github.com/urbit/urbit/blob/master/CONTRIBUTING.md),. From a8d59bf7a3cfc1f09b9f833f62c8230d2840f314 Mon Sep 17 00:00:00 2001 From: Philip C Monk Date: Wed, 2 Sep 2015 19:20:11 -0400 Subject: [PATCH 3/6] performance improvements --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a148ff209..014516e39 100644 --- a/Makefile +++ b/Makefile @@ -71,7 +71,7 @@ INCLUDE=include MDEFINES=-DU3_OS_$(OS) -DU3_OS_ENDIAN_$(ENDIAN) -D U3_LIB=\"$(LIB)\" # NOTFORCHECKIN - restore -O3 -# -DGHETTO +# -DGHETTO \ # -DHUSH CFLAGS= $(COSFLAGS) -O3 -msse3 -ffast-math \ -funsigned-char \ From dec6320b8230eb4bb662aca2f8c86c22a09df67b Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Wed, 9 Sep 2015 16:52:53 -0700 Subject: [PATCH 4/6] newline on bail --- noun/manage.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/noun/manage.c b/noun/manage.c index cda08bae6..25a35a750 100644 --- a/noun/manage.c +++ b/noun/manage.c @@ -593,12 +593,12 @@ u3m_bail(u3_noun how) str_c[2] = ((how >> 16) & 0xff); str_c[3] = ((how >> 24) & 0xff); str_c[4] = 0; - fprintf(stderr, "bail: %s\r\n", str_c); + fprintf(stderr, "\r\nbail: %s\r\n", str_c); } else { c3_assert(_(u3ud(u3h(how)))); - fprintf(stderr, "bail: %d\r\n", u3h(how)); + fprintf(stderr, "\r\nbail: %d\r\n", u3h(how)); u3m_p("bail", u3t(how)); } } From f0d6f92584301e1e976ec2e213e65a22f01cf5de Mon Sep 17 00:00:00 2001 From: Kingdon Date: Thu, 10 Sep 2015 00:56:13 -0400 Subject: [PATCH 5/6] update reference --- debian/docs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/docs b/debian/docs index 8d526b990..b43bf86b5 100644 --- a/debian/docs +++ b/debian/docs @@ -1 +1 @@ -README.markdown +README.md From 2bb098c1eda90cd30e68399ac4254b566294d383 Mon Sep 17 00:00:00 2001 From: Kingdon Date: Thu, 10 Sep 2015 00:56:36 -0400 Subject: [PATCH 6/6] patchset --- Makefile | 3 ++- outside/scrypt/crypto_scrypt.h | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 014516e39..58a8ec34a 100644 --- a/Makefile +++ b/Makefile @@ -73,7 +73,7 @@ MDEFINES=-DU3_OS_$(OS) -DU3_OS_ENDIAN_$(ENDIAN) -D U3_LIB=\"$(LIB)\" # NOTFORCHECKIN - restore -O3 # -DGHETTO \ # -DHUSH -CFLAGS= $(COSFLAGS) -O3 -msse3 -ffast-math \ +CFLAGS= $(COSFLAGS) -O3 -ffast-math \ -funsigned-char \ -I/usr/local/include \ -I/opt/local/include \ @@ -473,6 +473,7 @@ debinstall: clean: $(RM) $(VERE_OFILES) $(BIN)/urbit urbit.pkg $(VERE_DFILES) + $(RM) -r debian/files debian/urbit* # 'make distclean all -jn' ∀ n>1 still does not work because it is possible # Make will attempt to build urbit while it is also cleaning urbit.. diff --git a/outside/scrypt/crypto_scrypt.h b/outside/scrypt/crypto_scrypt.h index e2638c5f3..39cad5c5b 100644 --- a/outside/scrypt/crypto_scrypt.h +++ b/outside/scrypt/crypto_scrypt.h @@ -30,7 +30,6 @@ #define _CRYPTO_SCRYPT_H_ #include -#include void smix(uint8_t *, size_t, uint64_t, uint32_t *, uint32_t *); void PBKDF2_SHA256(const uint8_t *, size_t, const uint8_t *, size_t,